From 2a8e0a5f7b5f97aabd1974cf02f01948352f38d4 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 8 May 2015 14:57:12 +0200 Subject: [PATCH] Renamed 'Typedef.h' to 'PlatformDefinitions.h'. --- include/CMakeLists.txt | 2 +- include/PolyVox/AStarPathfinder.h | 2 +- include/PolyVox/Array.h | 2 +- include/PolyVox/CubicSurfaceExtractor.h | 2 +- include/PolyVox/DefaultIsQuadNeeded.h | 2 +- include/PolyVox/Density.h | 2 +- include/PolyVox/FilePager.h | 2 +- .../PolyVox/Impl/{TypeDef.h => PlatformDefinitions.h} | 10 +++++++--- include/PolyVox/Impl/RandomUnitVectors.h | 2 +- include/PolyVox/Impl/Utility.h | 2 +- include/PolyVox/MarchingCubesSurfaceExtractor.h | 2 +- include/PolyVox/Material.h | 2 +- include/PolyVox/MaterialDensityPair.h | 2 +- include/PolyVox/Mesh.h | 2 +- include/PolyVox/PolyVoxForwardDeclarations.h | 2 +- include/PolyVox/Region.h | 2 +- include/PolyVox/Vector.h | 2 +- include/PolyVox/Vertex.h | 2 +- include/PolyVox/VoxelFilters.h | 2 +- 19 files changed, 25 insertions(+), 21 deletions(-) rename include/PolyVox/Impl/{TypeDef.h => PlatformDefinitions.h} (92%) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 61498569..15322be6 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -84,10 +84,10 @@ SET(IMPL_INC_FILES PolyVox/Impl/ErrorHandling.h PolyVox/Impl/Logging.h PolyVox/Impl/MarchingCubesTables.h + PolyVox/Impl/PlatformDefinitions.h PolyVox/Impl/RandomUnitVectors.h PolyVox/Impl/RandomVectors.h PolyVox/Impl/Timer.h - PolyVox/Impl/TypeDef.h PolyVox/Impl/Utility.h ) diff --git a/include/PolyVox/AStarPathfinder.h b/include/PolyVox/AStarPathfinder.h index d453cff3..6aa2b71f 100644 --- a/include/PolyVox/AStarPathfinder.h +++ b/include/PolyVox/AStarPathfinder.h @@ -25,7 +25,7 @@ freely, subject to the following restrictions: #define __PolyVox_AStarPathfinder_H__ #include "Impl/AStarPathfinderImpl.h" -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include #include diff --git a/include/PolyVox/Array.h b/include/PolyVox/Array.h index 82458af1..fec7ca5e 100644 --- a/include/PolyVox/Array.h +++ b/include/PolyVox/Array.h @@ -24,7 +24,7 @@ distribution. #ifndef __PolyVox_Array_H__ #define __PolyVox_Array_H__ -#include +#include #include #include diff --git a/include/PolyVox/CubicSurfaceExtractor.h b/include/PolyVox/CubicSurfaceExtractor.h index 19f726b7..19d1514d 100644 --- a/include/PolyVox/CubicSurfaceExtractor.h +++ b/include/PolyVox/CubicSurfaceExtractor.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_CubicSurfaceExtractor_H__ #define __PolyVox_CubicSurfaceExtractor_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVoxForwardDeclarations.h" diff --git a/include/PolyVox/DefaultIsQuadNeeded.h b/include/PolyVox/DefaultIsQuadNeeded.h index 5c25c8c1..8a47e463 100644 --- a/include/PolyVox/DefaultIsQuadNeeded.h +++ b/include/PolyVox/DefaultIsQuadNeeded.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_DefaultIsQuadNeeded_H__ #define __PolyVox_DefaultIsQuadNeeded_H__ -#include "PolyVox/Impl/TypeDef.h" +#include "PolyVox/Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/Density.h b/include/PolyVox/Density.h index 22b24f85..ea2da8eb 100644 --- a/include/PolyVox/Density.h +++ b/include/PolyVox/Density.h @@ -26,7 +26,7 @@ freely, subject to the following restrictions: #include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/FilePager.h b/include/PolyVox/FilePager.h index 597ade33..e85d4b25 100644 --- a/include/PolyVox/FilePager.h +++ b/include/PolyVox/FilePager.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_FilePager_H__ #define __PolyVox_FilePager_H__ -#include "PolyVox/Impl/TypeDef.h" +#include "PolyVox/Impl/PlatformDefinitions.h" #include "PolyVox/PagedVolume.h" #include "PolyVox/Region.h" diff --git a/include/PolyVox/Impl/TypeDef.h b/include/PolyVox/Impl/PlatformDefinitions.h similarity index 92% rename from include/PolyVox/Impl/TypeDef.h rename to include/PolyVox/Impl/PlatformDefinitions.h index 63fd18b3..f020aad0 100644 --- a/include/PolyVox/Impl/TypeDef.h +++ b/include/PolyVox/Impl/PlatformDefinitions.h @@ -21,8 +21,12 @@ freely, subject to the following restrictions: distribution. *******************************************************************************/ -#ifndef __PolyVox_TypeDef_H__ -#define __PolyVox_TypeDef_H__ +/** + * This file contains definitions for various macros, etc, which need to be different + * for each platform. It helps keep per-platform logic outside the rest of PolyVox. + */ +#ifndef __PolyVox_PlatformDefinitions_H__ +#define __PolyVox_PlatformDefinitions_H__ #if defined(_MSC_VER) && (_MSC_VER < 1800) #error "Your version of Visual Studio is too old to build PolyVox. You need at least version Visual Stusio 2013" @@ -91,4 +95,4 @@ freely, subject to the following restrictions: // Implementation from here: http://stackoverflow.com/a/4851173/2337254 #define POLYVOX_UNUSED(x) do { (void)sizeof(x); } while(0) -#endif +#endif //__PolyVox_PlatformDefinitions_H__ diff --git a/include/PolyVox/Impl/RandomUnitVectors.h b/include/PolyVox/Impl/RandomUnitVectors.h index 95ff60e3..0287fb4d 100644 --- a/include/PolyVox/Impl/RandomUnitVectors.h +++ b/include/PolyVox/Impl/RandomUnitVectors.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_RandomUnitVectors_H__ #define __PolyVox_RandomUnitVectors_H__ -#include "PolyVox/Impl/TypeDef.h" +#include "PolyVox/Impl/PlatformDefinitions.h" #include "PolyVox/Vector.h" diff --git a/include/PolyVox/Impl/Utility.h b/include/PolyVox/Impl/Utility.h index 2fb3e59e..1d9526e3 100644 --- a/include/PolyVox/Impl/Utility.h +++ b/include/PolyVox/Impl/Utility.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ -#include "PolyVox/Impl/TypeDef.h" +#include "PolyVox/Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/MarchingCubesSurfaceExtractor.h b/include/PolyVox/MarchingCubesSurfaceExtractor.h index 565034ff..6946f68d 100644 --- a/include/PolyVox/MarchingCubesSurfaceExtractor.h +++ b/include/PolyVox/MarchingCubesSurfaceExtractor.h @@ -25,7 +25,7 @@ freely, subject to the following restrictions: #define __PolyVox_SurfaceExtractor_H__ #include "Impl/MarchingCubesTables.h" -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVox/Array.h" #include "PolyVox/BaseVolume.h" //For wrap modes... should move these? diff --git a/include/PolyVox/Material.h b/include/PolyVox/Material.h index e3d98c99..a3023bab 100644 --- a/include/PolyVox/Material.h +++ b/include/PolyVox/Material.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Material_H__ #define __PolyVox_Material_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type diff --git a/include/PolyVox/MaterialDensityPair.h b/include/PolyVox/MaterialDensityPair.h index 87592ce7..5df95d7e 100644 --- a/include/PolyVox/MaterialDensityPair.h +++ b/include/PolyVox/MaterialDensityPair.h @@ -27,7 +27,7 @@ freely, subject to the following restrictions: #include "PolyVox/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type #include "PolyVox/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" namespace PolyVox { diff --git a/include/PolyVox/Mesh.h b/include/PolyVox/Mesh.h index 64dbd11b..d4135299 100644 --- a/include/PolyVox/Mesh.h +++ b/include/PolyVox/Mesh.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Mesh_H__ #define __PolyVox_Mesh_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVox/PolyVoxForwardDeclarations.h" #include "PolyVox/Region.h" diff --git a/include/PolyVox/PolyVoxForwardDeclarations.h b/include/PolyVox/PolyVoxForwardDeclarations.h index 791baba2..9dbc44ca 100644 --- a/include/PolyVox/PolyVoxForwardDeclarations.h +++ b/include/PolyVox/PolyVoxForwardDeclarations.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_ForwardDeclarations_H__ #define __PolyVox_ForwardDeclarations_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/Region.h b/include/PolyVox/Region.h index 71cdb09f..bd44af8a 100644 --- a/include/PolyVox/Region.h +++ b/include/PolyVox/Region.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Region_H__ #define __PolyVox_Region_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVox/Vector.h" diff --git a/include/PolyVox/Vector.h b/include/PolyVox/Vector.h index d8918516..63a76472 100644 --- a/include/PolyVox/Vector.h +++ b/include/PolyVox/Vector.h @@ -25,7 +25,7 @@ freely, subject to the following restrictions: #define __PolyVox_Vector_H__ #include "Impl/ErrorHandling.h" -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVoxForwardDeclarations.h" diff --git a/include/PolyVox/Vertex.h b/include/PolyVox/Vertex.h index 12900c5a..34d524fc 100644 --- a/include/PolyVox/Vertex.h +++ b/include/PolyVox/Vertex.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Vertex_H__ #define __PolyVox_Vertex_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" #include "PolyVox/Vector.h" diff --git a/include/PolyVox/VoxelFilters.h b/include/PolyVox/VoxelFilters.h index af48dd6d..aba0c0f2 100644 --- a/include/PolyVox/VoxelFilters.h +++ b/include/PolyVox/VoxelFilters.h @@ -24,7 +24,7 @@ freely, subject to the following restrictions: #ifndef __PolyVox_VoxelFilters_H__ #define __PolyVox_VoxelFilters_H__ -#include "Impl/TypeDef.h" +#include "Impl/PlatformDefinitions.h" namespace PolyVox {