diff options
| author | Charles Giessen <charles@lunarg.com> | 2023-06-14 17:25:30 -0600 |
|---|---|---|
| committer | Charles Giessen <46324611+charles-lunarg@users.noreply.github.com> | 2023-06-15 11:39:42 -0600 |
| commit | 885c3c6f06ec472edeac8eed5d57aa9b453ae2eb (patch) | |
| tree | aeef894ec85aad5d1e9e9041a6433ac4f4f53ce9 | |
| parent | 2c83dd6cb2ef710bab843b69776997d6f2c12ba4 (diff) | |
| download | usermoji-885c3c6f06ec472edeac8eed5d57aa9b453ae2eb.tar.xz | |
icd: Use #pragma once in header
| -rw-r--r-- | icd/generated/mock_icd.h | 4 | ||||
| -rw-r--r-- | scripts/mock_icd_generator.py | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/icd/generated/mock_icd.h b/icd/generated/mock_icd.h index 79dc7807..1df7433f 100644 --- a/icd/generated/mock_icd.h +++ b/icd/generated/mock_icd.h @@ -1,5 +1,4 @@ -#ifndef __mock_icd_h_ -#define __mock_icd_h_ 1 +#pragma once /* ** Copyright (c) 2015-2018, 2023 The Khronos Group Inc. @@ -4961,4 +4960,3 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = { } // namespace vkmock -#endif diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index abce9bfd..c91c4704 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -1554,9 +1554,7 @@ class MockICDOutputGenerator(OutputGenerator): self.header = False if (genOpts.protectFile and self.genOpts.filename and 'h' == self.genOpts.filename[-1]): self.header = True - headerSym = '__' + re.sub(r'\.h', '_h_', os.path.basename(self.genOpts.filename)) - write('#ifndef', headerSym, file=self.outFile) - write('#define', headerSym, '1', file=self.outFile) + write('#pragma once', file=self.outFile) self.newline() # # User-supplied prefix text, if any (list of strings) @@ -1614,7 +1612,7 @@ class MockICDOutputGenerator(OutputGenerator): def endFile(self): # C-specific - # Finish C++ namespace and multiple inclusion protection + # Finish C++ namespace self.newline() if self.header: # record intercepted procedures @@ -1625,7 +1623,6 @@ class MockICDOutputGenerator(OutputGenerator): self.newline() write('} // namespace vkmock', file=self.outFile) self.newline() - write('#endif', file=self.outFile) else: # Loader-layer-interface, need to implement global interface functions write(SOURCE_CPP_POSTFIX, file=self.outFile) # Finish processing in superclass |