From ebc0ad9cca4721873853b05e7d7d44b809dcaec5 Mon Sep 17 00:00:00 2001 From: David Williams Date: Thu, 13 Mar 2008 22:21:50 +0000 Subject: [PATCH] Renamed some headers to avoid ambiguity. --- CMakeLists.txt | 4 ++-- include/IndexedSurfacePatch.h | 2 +- .../{ForwardDeclarations.h => PolyVoxForwardDeclarations.h} | 0 include/PolyVoxSceneManager.h | 2 +- include/RegionGeometry.h | 2 +- include/Volume.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename include/{ForwardDeclarations.h => PolyVoxForwardDeclarations.h} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eed93741..e79d20e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ SET(SRC_FILES #Projects headers files SET(INC_FILES include/Block.h - include/Constants.h - include/ForwardDeclarations.h + include/Constants.h include/IndexedSurfacePatch.h include/MarchingCubesTables.h + include/PolyVoxForwardDeclarations.h include/PolyVoxSceneManager.h include/RegionGeometry.h include/SurfaceEdge.h diff --git a/include/IndexedSurfacePatch.h b/include/IndexedSurfacePatch.h index 210830f9..88a670b0 100644 --- a/include/IndexedSurfacePatch.h +++ b/include/IndexedSurfacePatch.h @@ -6,7 +6,7 @@ #include "boost/cstdint.hpp" #include "Constants.h" -#include "ForwardDeclarations.h" +#include "PolyVoxForwardDeclarations.h" #include "SurfaceVertex.h" #include "TypeDef.h" diff --git a/include/ForwardDeclarations.h b/include/PolyVoxForwardDeclarations.h similarity index 100% rename from include/ForwardDeclarations.h rename to include/PolyVoxForwardDeclarations.h diff --git a/include/PolyVoxSceneManager.h b/include/PolyVoxSceneManager.h index e2873d04..605eb6e3 100644 --- a/include/PolyVoxSceneManager.h +++ b/include/PolyVoxSceneManager.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "boost/cstdint.hpp" #include "Constants.h" -#include "ForwardDeclarations.h" +#include "PolyVoxForwardDeclarations.h" #include "TypeDef.h" namespace PolyVox diff --git a/include/RegionGeometry.h b/include/RegionGeometry.h index b35ce06e..073c3968 100644 --- a/include/RegionGeometry.h +++ b/include/RegionGeometry.h @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef __PolyVox_RegionGeometry_H__ #define __PolyVox_RegionGeometry_H__ -#include "ForwardDeclarations.h" +#include "PolyVoxForwardDeclarations.h" #include "TypeDef.h" #include "Vector.h" diff --git a/include/Volume.h b/include/Volume.h index f947ed36..c55b7e8d 100644 --- a/include/Volume.h +++ b/include/Volume.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "boost/cstdint.hpp" #include "Constants.h" -#include "ForwardDeclarations.h" +#include "PolyVoxForwardDeclarations.h" #include "TypeDef.h" #include "Vector.h"