From 5644f837ca11c141dd3b5a9c4c907b2ea2fd4420 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 24 Jan 2016 13:15:51 +0000 Subject: [PATCH] Fixed broken include paths causing compile errors on Linux. --- include/CMakeLists.txt | 1 + include/PolyVox/Array.h | 4 ++-- include/PolyVox/Exceptions.h | 2 +- include/PolyVox/Impl/AStarPathfinderImpl.h | 2 +- include/PolyVox/Impl/Assertions.h | 6 +++--- include/PolyVox/Impl/ErrorHandling.h | 6 +++--- include/PolyVox/Impl/ExceptionsImpl.h | 6 +++--- include/PolyVox/Impl/IteratorController.h | 4 ++-- include/PolyVox/Impl/LoggingImpl.h | 5 ++--- include/PolyVox/Impl/MarchingCubesTables.h | 2 +- include/PolyVox/Impl/RandomUnitVectors.h | 4 ++-- include/PolyVox/Impl/RandomVectors.h | 4 ++-- include/PolyVox/Impl/Timer.h | 3 +-- include/PolyVox/Impl/Utility.h | 2 +- 14 files changed, 25 insertions(+), 26 deletions(-) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 925bda96..1f6cd64f 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -43,6 +43,7 @@ SET(CORE_INC_FILES PolyVox/Density.h PolyVox/Exceptions.h PolyVox/FilePager.h + PolyVox/Logging.h PolyVox/LowPassFilter.h PolyVox/LowPassFilter.inl PolyVox/MarchingCubesSurfaceExtractor.h diff --git a/include/PolyVox/Array.h b/include/PolyVox/Array.h index 7ca8b1fc..c8ad1721 100644 --- a/include/PolyVox/Array.h +++ b/include/PolyVox/Array.h @@ -25,8 +25,8 @@ #ifndef __PolyVox_Array_H__ #define __PolyVox_Array_H__ -#include -#include +#include "Impl/ErrorHandling.h" +#include "Impl/PlatformDefinitions.h" #include diff --git a/include/PolyVox/Exceptions.h b/include/PolyVox/Exceptions.h index 31b1e5b4..d8dd3830 100644 --- a/include/PolyVox/Exceptions.h +++ b/include/PolyVox/Exceptions.h @@ -26,7 +26,7 @@ #define __PolyVox_Exceptions_H__ #include // For base exception classes. -#include // Exception constuctors take strings. +#include // Exception constuctors take strings. // These exceptions form part of the public API because client code may need to catch them. // Note that our utility macros such as 'POLYVOX_THROW_IF' do not form part of the public API diff --git a/include/PolyVox/Impl/AStarPathfinderImpl.h b/include/PolyVox/Impl/AStarPathfinderImpl.h index bdf13db6..611c33b4 100644 --- a/include/PolyVox/Impl/AStarPathfinderImpl.h +++ b/include/PolyVox/Impl/AStarPathfinderImpl.h @@ -25,7 +25,7 @@ #ifndef __PolyVox_AStarPathfinderImpl_H__ #define __PolyVox_AStarPathfinderImpl_H__ -#include "PolyVox/Vector.h" +#include "../Vector.h" #include #include //For numeric_limits diff --git a/include/PolyVox/Impl/Assertions.h b/include/PolyVox/Impl/Assertions.h index 52e45b90..9e8ad4b6 100644 --- a/include/PolyVox/Impl/Assertions.h +++ b/include/PolyVox/Impl/Assertions.h @@ -25,10 +25,10 @@ #ifndef __PolyVox_Assertions_H__ #define __PolyVox_Assertions_H__ -#include "PolyVox/Config.h" +#include "../Config.h" -#include "PolyVox/Impl/LoggingImpl.h" // Asserts can log when they fire. -#include "PolyVox/Impl/PlatformDefinitions.h" +#include "LoggingImpl.h" // Asserts can log when they fire. +#include "PlatformDefinitions.h" // The code below implements a custom assert function called POLYVOX_ASSERT which has a number of advantages compared // to the standard C/C++ assert(). It is inspired by http://cnicholson.net/2009/02/stupid-c-tricks-adventures-in-assert/ diff --git a/include/PolyVox/Impl/ErrorHandling.h b/include/PolyVox/Impl/ErrorHandling.h index 2b454a50..9035324b 100644 --- a/include/PolyVox/Impl/ErrorHandling.h +++ b/include/PolyVox/Impl/ErrorHandling.h @@ -26,8 +26,8 @@ #ifndef __PolyVox_ErrorHandling_H__ #define __PolyVox_ErrorHandling_H__ -#include "PolyVox/Impl/Assertions.h" -#include "PolyVox/Impl/ExceptionsImpl.h" -#include "PolyVox/Impl/LoggingImpl.h" +#include "Assertions.h" +#include "ExceptionsImpl.h" +#include "LoggingImpl.h" #endif //__PolyVox_ErrorHandling_H__ diff --git a/include/PolyVox/Impl/ExceptionsImpl.h b/include/PolyVox/Impl/ExceptionsImpl.h index 8cb7003e..5662a21a 100644 --- a/include/PolyVox/Impl/ExceptionsImpl.h +++ b/include/PolyVox/Impl/ExceptionsImpl.h @@ -25,10 +25,10 @@ #ifndef __PolyVox_ExceptionsImpl_H__ #define __PolyVox_ExceptionsImpl_H__ -#include "PolyVox/Config.h" -#include "PolyVox/Exceptions.h" +#include "../Config.h" +#include "../Exceptions.h" -#include "PolyVox/Impl/LoggingImpl.h" // Exceptions can log when they are thrown. +#include "LoggingImpl.h" // Exceptions can log when they are thrown. #include // For std::exit #include // For std::cerr diff --git a/include/PolyVox/Impl/IteratorController.h b/include/PolyVox/Impl/IteratorController.h index e614016d..4dd83e02 100644 --- a/include/PolyVox/Impl/IteratorController.h +++ b/include/PolyVox/Impl/IteratorController.h @@ -25,7 +25,7 @@ #ifndef __PolyVox_IteratorController_H__ #define __PolyVox_IteratorController_H__ -#include "Region.h" +#include "../Region.h" namespace PolyVox { @@ -43,6 +43,6 @@ namespace PolyVox }; } -#include "Impl/IteratorController.inl" +#include "IteratorController.inl" #endif //__PolyVox_IteratorController_H__ diff --git a/include/PolyVox/Impl/LoggingImpl.h b/include/PolyVox/Impl/LoggingImpl.h index a1eec2c6..7a1401b3 100644 --- a/include/PolyVox/Impl/LoggingImpl.h +++ b/include/PolyVox/Impl/LoggingImpl.h @@ -25,12 +25,11 @@ #ifndef __PolyVox_LoggingImpl_H__ #define __PolyVox_LoggingImpl_H__ -#include "PolyVox/Config.h" -#include "PolyVox/Logging.h" +#include "../Config.h" +#include "../Logging.h" #include - namespace PolyVox { namespace Impl diff --git a/include/PolyVox/Impl/MarchingCubesTables.h b/include/PolyVox/Impl/MarchingCubesTables.h index c1a3307f..fb7039b8 100644 --- a/include/PolyVox/Impl/MarchingCubesTables.h +++ b/include/PolyVox/Impl/MarchingCubesTables.h @@ -25,7 +25,7 @@ #ifndef __PolyVox_MarchingCubeTables_H__ #define __PolyVox_MarchingCubeTables_H__ -#include "PolyVox/Impl/PlatformDefinitions.h" +#include "PlatformDefinitions.h" #include diff --git a/include/PolyVox/Impl/RandomUnitVectors.h b/include/PolyVox/Impl/RandomUnitVectors.h index bd44fc69..3a33fd72 100644 --- a/include/PolyVox/Impl/RandomUnitVectors.h +++ b/include/PolyVox/Impl/RandomUnitVectors.h @@ -25,9 +25,9 @@ #ifndef __PolyVox_RandomUnitVectors_H__ #define __PolyVox_RandomUnitVectors_H__ -#include "PolyVox/Impl/PlatformDefinitions.h" +#include "PlatformDefinitions.h" -#include "PolyVox/Vector.h" +#include "../Vector.h" namespace PolyVox { diff --git a/include/PolyVox/Impl/RandomVectors.h b/include/PolyVox/Impl/RandomVectors.h index 719b1a92..f23d6e62 100644 --- a/include/PolyVox/Impl/RandomVectors.h +++ b/include/PolyVox/Impl/RandomVectors.h @@ -25,9 +25,9 @@ #ifndef __PolyVox_RandomVectors_H__ #define __PolyVox_RandomVectors_H__ -#include "PolyVox/Impl/PlatformDefinitions.h" +#include "PlatformDefinitions.h" -#include "PolyVox/Vector.h" +#include "../Vector.h" namespace PolyVox { diff --git a/include/PolyVox/Impl/Timer.h b/include/PolyVox/Impl/Timer.h index 018cb91e..ea3dcd4c 100644 --- a/include/PolyVox/Impl/Timer.h +++ b/include/PolyVox/Impl/Timer.h @@ -25,9 +25,8 @@ #ifndef __PolyVox_Timer_H__ #define __PolyVox_Timer_H__ -#include - #include +#include namespace PolyVox { diff --git a/include/PolyVox/Impl/Utility.h b/include/PolyVox/Impl/Utility.h index 180e588c..8b668dfe 100644 --- a/include/PolyVox/Impl/Utility.h +++ b/include/PolyVox/Impl/Utility.h @@ -25,7 +25,7 @@ #ifndef __PolyVox_Utility_H__ #define __PolyVox_Utility_H__ -#include "PolyVox/Impl/PlatformDefinitions.h" +#include "PlatformDefinitions.h" #include