Rename endian.h to spirv_endian.h

If we later add a source/ as an -I include directory,
then avoid confusing other headers that want to include the
standard "endian.h" from /usr/include.

Also rename source/endian.cpp to source/spirv_endian.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4e2007..8f7700a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,6 @@ set(SPIRV_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/source/assembly_grammar.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/binary.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/diagnostic.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/source/endian.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/ext_inst.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/instruction.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/opcode.h
@@ -111,6 +110,7 @@ set(SPIRV_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/source/print.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/spirv_constant.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/spirv_definition.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/spirv_endian.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/table.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/text.h
   ${CMAKE_CURRENT_SOURCE_DIR}/source/text_handler.h
@@ -120,11 +120,11 @@ set(SPIRV_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/source/binary.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/disassemble.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/diagnostic.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/source/endian.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/ext_inst.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/opcode.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/operand.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/print.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/source/spirv_endian.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/table.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/text.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/source/text_handler.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 5d36dfb..533fe7f 100755 (executable)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -34,12 +34,12 @@
 
 #include "assembly_grammar.h"
 #include "diagnostic.h"
-#include "endian.h"
 #include "ext_inst.h"
 #include "libspirv/libspirv.h"
 #include "opcode.h"
 #include "operand.h"
 #include "spirv_constant.h"
+#include "spirv_endian.h"
 
 spv_result_t spvBinaryHeaderGet(const spv_const_binary binary,
                                 const spv_endianness_t endian,

diff --git a/source/disassemble.cpp b/source/disassemble.cpp
index 292caa0..07ba2b4 100644 (file)
--- a/source/disassemble.cpp
+++ b/source/disassemble.cpp
@@ -34,12 +34,12 @@
 #include "assembly_grammar.h"
 #include "binary.h"
 #include "diagnostic.h"
-#include "endian.h"
 #include "ext_inst.h"
 #include "libspirv/libspirv.h"
 #include "opcode.h"
 #include "print.h"
 #include "spirv_constant.h"
+#include "spirv_endian.h"
 #include "util/hex_float.h"
 
 namespace {

diff --git a/source/opcode.cpp b/source/opcode.cpp
index 3027bcd..114fe84 100644 (file)
--- a/source/opcode.cpp
+++ b/source/opcode.cpp
@@ -31,10 +31,10 @@
 
 #include <cstdlib>
 
-#include "endian.h"
 #include "instruction.h"
 #include "libspirv/libspirv.h"
 #include "spirv_constant.h"
+#include "spirv_endian.h"
 #include "spirv_operands.h"
 
 namespace {

diff --git a/source/endian.cpp b/source/spirv_endian.cpp
similarity index 99%
rename from source/endian.cpp
rename to source/spirv_endian.cpp
index 8c39f29..1e12231 100644 (file)
--- a/source/endian.cpp
+++ b/source/spirv_endian.cpp
@@ -24,7 +24,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 
-#include "endian.h"
+#include "spirv_endian.h"
 
 #include <cstring>
 

diff --git a/source/endian.h b/source/spirv_endian.h
similarity index 95%
rename from source/endian.h
rename to source/spirv_endian.h
index 5c25f33..70b8fe8 100644 (file)
--- a/source/endian.h
+++ b/source/spirv_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_ENDIAN_H_
-#define LIBSPIRV_ENDIAN_H_
+#ifndef LIBSPIRV_SPIRV_ENDIAN_H_
+#define LIBSPIRV_SPIRV_ENDIAN_H_
 
 #include "libspirv/libspirv.h"
 
@@ -46,4 +46,4 @@ spv_result_t spvBinaryEndianness(const spv_const_binary binary,
 // Returns true if the given endianness matches the host's native endiannes.
 bool spvIsHostEndian(spv_endianness_t endian);
 
-#endif  // LIBSPIRV_ENDIAN_H_
+#endif  // LIBSPIRV_SPIRV_ENDIAN_H_

diff --git a/source/validate.cpp b/source/validate.cpp
index 24a9793..80bb4c4 100644 (file)
--- a/source/validate.cpp
+++ b/source/validate.cpp
@@ -29,12 +29,12 @@
 
 #include "binary.h"
 #include "diagnostic.h"
-#include "endian.h"
 #include "instruction.h"
 #include "libspirv/libspirv.h"
 #include "opcode.h"
 #include "operand.h"
 #include "spirv_constant.h"
+#include "spirv_endian.h"
 
 #include <algorithm>
 #include <cassert>

diff --git a/test/UnitSPIRV.h b/test/UnitSPIRV.h
index a5fb32d..5c32155 100644 (file)
--- a/test/UnitSPIRV.h
+++ b/test/UnitSPIRV.h
@@ -35,8 +35,8 @@
 #include "../source/assembly_grammar.h"
 #include "../source/binary.h"
 #include "../source/diagnostic.h"
-#include "../source/endian.h"
 #include "../source/opcode.h"
+#include "../source/spirv_endian.h"
 #include "../source/text.h"
 #include "../source/text_handler.h"
 #include "../source/validate.h"