Inclusion guards follow Google C++ style

Follow the scheme in
http://google-styleguide.googlecode.com/svn/trunk/cppguide.html#The__define_Guard
except:
 - 'include/' is dropped from the guard token
 - 'source/' is dropped from the guard token

diff --git a/include/libspirv/libspirv.h b/include/libspirv/libspirv.h
index 8f2e7cd..8aca1fa 100644 (file)
--- a/include/libspirv/libspirv.h
+++ b/include/libspirv/libspirv.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _CODEPLAY_SPIRV_SPIRV_H_
-#define _CODEPLAY_SPIRV_SPIRV_H_
+#ifndef LIBSPIRV_LIBSPIRV_LIBSPIRV_H_
+#define LIBSPIRV_LIBSPIRV_LIBSPIRV_H_
 
 #include <headers/spirv.hpp>
 #include <headers/spirv_operands.hpp>
@@ -550,4 +550,4 @@ spv_result_t spvDiagnosticPrint(const spv_diagnostic diagnostic);
 }
 #endif
 
-#endif
+#endif  // LIBSPIRV_LIBSPIRV_LIBSPIRV_H_

diff --git a/include/util/bitutils.h b/include/util/bitutils.h
index 177467b..00c2a2f 100644 (file)
--- a/include/util/bitutils.h
+++ b/include/util/bitutils.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_BITUTILS_H_
-#define _LIBSPIRV_UTIL_BITUTILS_H_
+#ifndef LIBSPIRV_UTIL_BITUTILS_H_
+#define LIBSPIRV_UTIL_BITUTILS_H_
 
 #include <cstring>
 
@@ -86,4 +86,4 @@ static_assert(SetBits<uint64_t, 16, 31>::get == uint64_t(0x0000FFFF00000000LL),
 
 }  // namespace spvutils
 
-#endif
+#endif  // LIBSPIRV_UTIL_BITUTILS_H_

diff --git a/source/assembly_grammar.h b/source/assembly_grammar.h
index 9cb9c4a..747e71b 100644 (file)
--- a/source/assembly_grammar.h
+++ b/source/assembly_grammar.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_ASSEMBLY_GRAMMAR_H_
-#define _LIBSPIRV_UTIL_ASSEMBLY_GRAMMAR_H_
+#ifndef LIBSPIRV_ASSEMBLY_GRAMMAR_H_
+#define LIBSPIRV_ASSEMBLY_GRAMMAR_H_
 
 #include <libspirv/libspirv.h>
 #include "operand.h"
@@ -110,5 +110,5 @@ class AssemblyGrammar {
   const spv_ext_inst_table extInstTable_;
 };
 }
-#endif  // _LIBSPIRV_UTIL_ASSEMBLY_GRAMMAR_H_
 
+#endif  // LIBSPIRV_ASSEMBLY_GRAMMAR_H_

diff --git a/source/binary.h b/source/binary.h
index 0544395..904dad7 100644 (file)
--- a/source/binary.h
+++ b/source/binary.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_BINARY_H_
-#define _LIBSPIRV_UTIL_BINARY_H_
+#ifndef LIBSPIRV_BINARY_H_
+#define LIBSPIRV_BINARY_H_
 
 #include <libspirv/libspirv.h>
 #include "instruction.h"
@@ -59,4 +59,4 @@ spv_operand_type_t spvBinaryOperandInfo(const uint32_t word,
                                         const spv_opcode_desc opcodeEntry,
                                         const spv_operand_table operandTable,
                                         spv_operand_desc *pOperandEntry);
-#endif
+#endif // LIBSPIRV_BINARY_H_

diff --git a/source/diagnostic.h b/source/diagnostic.h
index d6c77fe..07bfde6 100644 (file)
--- a/source/diagnostic.h
+++ b/source/diagnostic.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_DIAGNOSTIC_H_
-#define _LIBSPIRV_UTIL_DIAGNOSTIC_H_
+#ifndef LIBSPIRV_DIAGNOSTIC_H_
+#define LIBSPIRV_DIAGNOSTIC_H_
 
 #include <libspirv/libspirv.h>
 
@@ -99,4 +99,4 @@ class DiagnosticStream {
   diagnostic_helper helper(position, pDiagnostic); \
   helper.stream
 
-#endif
+#endif  // LIBSPIRV_DIAGNOSTIC_H_

diff --git a/source/endian.h b/source/endian.h
index f786b19..5045387 100644 (file)
--- a/source/endian.h
+++ b/source/endian.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_ENDIAN_H_
-#define _LIBSPIRV_UTIL_ENDIAN_H_
+#ifndef LIBSPIRV_ENDIAN_H_
+#define LIBSPIRV_ENDIAN_H_
 
 #include <libspirv/libspirv.h>
 
@@ -59,4 +59,5 @@ uint64_t spvFixDoubleWord(const uint32_t low, const uint32_t high,
 /// @return result code
 spv_result_t spvBinaryEndianness(const spv_binary binary,
                                  spv_endianness_t *pEndian);
-#endif
+
+#endif  // LIBSPIRV_ENDIAN_H_

diff --git a/source/ext_inst.h b/source/ext_inst.h
index 341547b..80f65c2 100644 (file)
--- a/source/ext_inst.h
+++ b/source/ext_inst.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _CODEPLAY_SPIRV_EXT_INST_H_
-#define _CODEPLAY_SPIRV_EXT_INST_H_
+#ifndef LIBSPIRV_EXT_INST_H_
+#define LIBSPIRV_EXT_INST_H_
 
 #include <libspirv/libspirv.h>
 
@@ -62,4 +62,4 @@ spv_result_t spvExtInstTableValueLookup(const spv_ext_inst_table table,
                                         const uint32_t value,
                                         spv_ext_inst_desc *pEntry);
 
-#endif
+#endif  // LIBSPIRV_EXT_INST_H_

diff --git a/source/instruction.h b/source/instruction.h
index 960fce3..a5fb94c 100644 (file)
--- a/source/instruction.h
+++ b/source/instruction.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_INSTRUCTION_H_
-#define _LIBSPIRV_UTIL_INSTRUCTION_H_
+#ifndef LIBSPIRV_INSTRUCTION_H_
+#define LIBSPIRV_INSTRUCTION_H_
 
 #include <cstdint>
 #include <vector>
@@ -57,4 +57,4 @@ inline void spvInstructionAddWord(spv_instruction_t* inst, uint32_t value) {
   inst->words.push_back(value);
 }
 
-#endif  // _LIBSPIRV_UTIL_INSTRUCTION_H_
+#endif  // LIBSPIRV_INSTRUCTION_H_

diff --git a/source/opcode.h b/source/opcode.h
index 6dea4ca..418ca42 100644 (file)
--- a/source/opcode.h
+++ b/source/opcode.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_OPCODE_H_
-#define _LIBSPIRV_UTIL_OPCODE_H_
+#ifndef LIBSPIRV_OPCODE_H_
+#define LIBSPIRV_OPCODE_H_
 
 #include "instruction.h"
 #include <libspirv/libspirv.h>
@@ -199,4 +199,4 @@ int32_t spvOpcodeIsValue(Op opcode);
 /// @return zero if false, non-zero otherwise
 int32_t spvOpcodeGeneratesType(Op op);
 
-#endif
+#endif  // LIBSPIRV_OPCODE_H_

diff --git a/source/operand.h b/source/operand.h
index 5e6f51f..7893e6d 100644 (file)
--- a/source/operand.h
+++ b/source/operand.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _CODEPLAY_SPIRV_OPERAND_H_
-#define _CODEPLAY_SPIRV_OPERAND_H_
+#ifndef LIBSPIRV_OPERAND_H_
+#define LIBSPIRV_OPERAND_H_
 
 #include <deque>
 
@@ -157,4 +157,4 @@ spv_operand_type_t spvTakeFirstMatchableOperand(spv_operand_pattern_t* pattern);
 spv_operand_pattern_t spvAlternatePatternFollowingImmediate(
     const spv_operand_pattern_t& pattern);
 
-#endif
+#endif  // LIBSPIRV_OPERAND_H_

diff --git a/source/print.h b/source/print.h
index 6e20da5..e68cc43 100644 (file)
--- a/source/print.h
+++ b/source/print.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_PRINT_H_
-#define _LIBSPIRV_PRINT_H_
+#ifndef LIBSPIRV_PRINT_H_
+#define LIBSPIRV_PRINT_H_
 
 #include <iostream>
 #include <sstream>
@@ -74,4 +74,4 @@ struct blue {
 };
 }
 
-#endif
+#endif  // LIBSPIRV_PRINT_H_

diff --git a/source/text.h b/source/text.h
index 78f906c..b89444f 100644 (file)
--- a/source/text.h
+++ b/source/text.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_TEXT_H_
-#define _LIBSPIRV_UTIL_TEXT_H_
+#ifndef LIBSPIRV_TEXT_H_
+#define LIBSPIRV_TEXT_H_
 
 #include <libspirv/libspirv.h>
 #include "operand.h"
@@ -76,4 +76,4 @@ typedef struct spv_literal_t {
 /// @return result code
 spv_result_t spvTextToLiteral(const char *textValue, spv_literal_t *pLiteral);
 
-#endif
+#endif  // LIBSPIRV_TEXT_H_

diff --git a/source/text_handler.h b/source/text_handler.h
index 9d9c125..e73c457 100644 (file)
--- a/source/text_handler.h
+++ b/source/text_handler.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_TEXT_HANDLER_H_
-#define _LIBSPIRV_UTIL_TEXT_HANDLER_H_
+#ifndef LIBSPIRV_TEXT_HANDLER_H_
+#define LIBSPIRV_TEXT_HANDLER_H_
 
 #include <iomanip>
 #include <limits>
@@ -304,5 +304,4 @@ class AssemblyContext {
   uint32_t bound_;
 };
 }
-#endif  // _LIBSPIRV_UTIL_TEXT_HANDLER_H_
-
+#endif  // _LIBSPIRV_TEXT_HANDLER_H_

diff --git a/source/validate.h b/source/validate.h
index cdd3691..0889d79 100644 (file)
--- a/source/validate.h
+++ b/source/validate.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _LIBSPIRV_UTIL_VALIDATE_H_
-#define _LIBSPIRV_UTIL_VALIDATE_H_
+#ifndef LIBSPIRV_VALIDATE_H_
+#define LIBSPIRV_VALIDATE_H_
 
 #include "instruction.h"
 #include <libspirv/libspirv.h>
@@ -81,4 +81,4 @@ spv_result_t spvValidateIDs(const spv_instruction_t *pInstructions,
                             const spv_ext_inst_table extInstTable,
                             spv_position position, spv_diagnostic *pDiagnostic);
 
-#endif
+#endif  // LIBSPIRV_VALIDATE_H_

diff --git a/test/TestFixture.h b/test/TestFixture.h
index ffb0c1b..201bf36 100644 (file)
--- a/test/TestFixture.h
+++ b/test/TestFixture.h
@@ -23,8 +23,9 @@
 // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-#ifndef _TEST_FIXTURE_H_
-#define _TEST_FIXTURE_H_
+
+#ifndef LIBSPIRV_TEST_TEST_FIXTURE_H_
+#define LIBSPIRV_TEST_TEST_FIXTURE_H_
 
 #include "UnitSPIRV.h"
 
@@ -204,4 +205,4 @@ using TextToBinaryTest = TextToBinaryTestBase<::testing::Test>;
 
 }  // namespace spvtest
 
-#endif  // _TEXT_FIXTURE_H_
+#endif  // LIBSPIRV_TEST_TEST_FIXTURE_H_

diff --git a/test/UnitSPIRV.h b/test/UnitSPIRV.h
index 5a52be3..efef22b 100644 (file)
--- a/test/UnitSPIRV.h
+++ b/test/UnitSPIRV.h
@@ -24,8 +24,8 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#ifndef _CODEPLAY_UNITBIL_H_
-#define _CODEPLAY_UNITBIL_H_
+#ifndef LIBSPIRV_TEST_UNITSPIRV_H_
+#define LIBSPIRV_TEST_UNITSPIRV_H_
 
 #include <libspirv/libspirv.h>
 #include "../source/assembly_grammar.h"
@@ -216,4 +216,4 @@ inline std::string MakeLongUTF8String(size_t num_4_byte_chars) {
 
 }  // namespace spvtest
 
-#endif
+#endif  // LIBSPIRV_TEST_UNITSPIRV_H_