Merge branch 'develop' into feature/cubiquity-version

CMakeLists.txt

@@ -65,7 +65,7 @@ endif()
 IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW"
 	ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
 ENDIF()
-if(CMAKE_CXX_COMPILER MATCHES "clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode
 endif()
 

library/PolyVoxCore/CMakeLists.txt

@@ -106,6 +106,7 @@ SET(CORE_INC_FILES
 
 SET(IMPL_SRC_FILES
 	source/Impl/ErrorHandling.cpp
+	source/Impl/Logging.cpp
 	source/Impl/MarchingCubesTables.cpp
 	source/Impl/MinizWrapper.cpp
 	source/Impl/RandomUnitVectors.cpp
@@ -121,6 +122,7 @@ SET(IMPL_INC_FILES
     include/PolyVoxCore/Impl/CompilerCapabilities.h
     include/PolyVoxCore/Impl/Config.h
 	include/PolyVoxCore/Impl/ErrorHandling.h
+	include/PolyVoxCore/Impl/Logging.h
 	include/PolyVoxCore/Impl/MarchingCubesTables.h
 	include/PolyVoxCore/Impl/MinizWrapper.h
 	include/PolyVoxCore/Impl/RandomUnitVectors.h

library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h

@@ -72,7 +72,7 @@ namespace PolyVox
 			uint32_t uMaxNoOfNodes = 10000,
 			Connectivity requiredConnectivity = TwentySixConnected,
 			polyvox_function<bool (const VolumeType*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
-			polyvox_function<void (float)> funcProgressCallback = 0
+			polyvox_function<void (float)> funcProgressCallback = nullptr
 		)
 			:volume(volData)
 			,start(v3dStart)

library/PolyVoxCore/include/PolyVoxCore/Impl/Config.h

@@ -24,6 +24,13 @@ freely, subject to the following restrictions:
 #ifndef __PolyVox_Config_H__
 #define __PolyVox_Config_H__
 
+#define POLYVOX_LOG_TRACE_ENABLED
+#define POLYVOX_LOG_DEBUG_ENABLED
+#define POLYVOX_LOG_INFO_ENABLED
+#define POLYVOX_LOG_WARNING_ENABLED
+#define POLYVOX_LOG_ERROR_ENABLED
+#define POLYVOX_LOG_FATAL_ENABLED
+
 #define POLYVOX_ASSERTS_ENABLED
 #define POLYVOX_THROW_ENABLED
 

library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h

@@ -26,6 +26,8 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Impl/Config.h"
 
+#include "PolyVoxCore/Impl/Logging.h"
+
 #include <cstdlib>  // For std::exit
 #include <iostream> // For std::cerr
 #include <stdexcept>
@@ -61,125 +63,6 @@ freely, subject to the following restrictions:
 
 #define POLYVOX_UNUSED(x) do { (void)sizeof(x); } while(0)
 
-/*
- * Logging
- * --------
- * PolyVox provides basic logging facilities which can be redirected by your application.
- */
-
-#define LOG_DECLARATION(name) \
-	std::ostream& log(name)(void); \
-	void set(name)Stream(std::ostream& nameStream);
-
-namespace PolyVox
-{
-	namespace Impl
-	{
-		std::ostream*& getTraceStreamInstance();
-		std::ostream*& getDebugStreamInstance();
-		std::ostream*& getInfoStreamInstance();
-		std::ostream*& getWarningStreamInstance();
-		std::ostream*& getErrorStreamInstance();
-		std::ostream*& getFatalStreamInstance();
-	}
-
-	/// Get a stream which will consume all input without outputting anything.
-	std::ostream* getNullStream(void);
-
-	// These take pointers rather than references to emphasise that the 
-	// user needs to keep the target alive as long as PolyVox is writing data.
-	void setTraceStream(std::ostream* pStream);
-	void setDebugStream(std::ostream* pStream);
-	void setInfoStream(std::ostream* pStream);
-	void setWarningStream(std::ostream* pStream);
-	void setErrorStream(std::ostream* pStream);
-	void setFatalStream(std::ostream* pStream);
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logTrace
-	{
-		logTrace(){}
-		~logTrace(){*(Impl::getTraceStreamInstance()) << std::endl;}
-
-		template<class T>
-		logTrace &operator<<(const T &x)
-		{
-			*(Impl::getTraceStreamInstance()) << x;
-			return *this;
-		}
-	};
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logDebug
-	{
-		logDebug(){}
-		~logDebug(){*(Impl::getDebugStreamInstance()) << std::endl;}
-
-		template<class T>
-		logDebug &operator<<(const T &x)
-		{
-			*(Impl::getDebugStreamInstance()) << x;
-			return *this;
-		}
-	};
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logInfo
-	{
-		logInfo(){}
-		~logInfo(){*(Impl::getInfoStreamInstance()) << std::endl;}
-
-		template<class T>
-		logInfo &operator<<(const T &x)
-		{
-			*(Impl::getInfoStreamInstance()) << x;
-			return *this;
-		}
-	};
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logWarning
-	{
-		logWarning(){}
-		~logWarning(){*(Impl::getWarningStreamInstance()) << std::endl;}
-
-		template<class T>
-		logWarning &operator<<(const T &x)
-		{
-			*(Impl::getWarningStreamInstance()) << x;
-			return *this;
-		}
-	};
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logError
-	{
-		logError(){}
-		~logError(){*(Impl::getErrorStreamInstance()) << std::endl;}
-
-		template<class T>
-		logError &operator<<(const T &x)
-		{
-			*(Impl::getErrorStreamInstance()) << x;
-			return *this;
-		}
-	};
-
-	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
-	struct logFatal
-	{
-		logFatal(){}
-		~logFatal(){*(Impl::getFatalStreamInstance()) << std::endl;}
-
-		template<class T>
-		logFatal &operator<<(const T &x)
-		{
-			*(Impl::getFatalStreamInstance()) << x;
-			return *this;
-		}
-	};
-}
-
 /*
  * Assertions
  * ----------

library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h

@@ -0,0 +1,469 @@
+/*******************************************************************************
+Copyright (c) 2005-2009 David Williams and Matthew Williams
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution. 	
+*******************************************************************************/
+
+#ifndef __PolyVox_Logging_H__
+#define __PolyVox_Logging_H__
+
+#include "PolyVoxCore/Impl/Config.h"
+
+#include <iostream>
+#include <sstream>
+
+/*
+ * Logging
+ * --------
+ * PolyVox provides basic logging facilities which can be redirected by your application.
+ */
+
+#define LOG_DECLARATION(name) \
+	std::ostream& log(name)(void); \
+	void set(name)Stream(std::ostream& nameStream);
+
+namespace PolyVox
+{
+	namespace Impl
+	{
+		std::ostream*& getTraceStreamInstance();
+		std::ostream*& getDebugStreamInstance();
+		std::ostream*& getInfoStreamInstance();
+		std::ostream*& getWarningStreamInstance();
+		std::ostream*& getErrorStreamInstance();
+		std::ostream*& getFatalStreamInstance();
+	}
+
+	/// Get a stream which will consume all input without outputting anything.
+	std::ostream* getNullStream(void);
+
+	// These take pointers rather than references to emphasise that the 
+	// user needs to keep the target alive as long as PolyVox is writing data.
+	void setTraceStream(std::ostream* pStream);
+	void setDebugStream(std::ostream* pStream);
+	void setInfoStream(std::ostream* pStream);
+	void setWarningStream(std::ostream* pStream);
+	void setErrorStream(std::ostream* pStream);
+	void setFatalStream(std::ostream* pStream);
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logTrace
+	{
+		logTrace(){}
+		~logTrace(){*(Impl::getTraceStreamInstance()) << std::endl;}
+
+		template<class T>
+		logTrace &operator<<(const T &x)
+		{
+			*(Impl::getTraceStreamInstance()) << x;
+			return *this;
+		}
+	};
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logDebug
+	{
+		logDebug(){}
+		~logDebug(){*(Impl::getDebugStreamInstance()) << std::endl;}
+
+		template<class T>
+		logDebug &operator<<(const T &x)
+		{
+			*(Impl::getDebugStreamInstance()) << x;
+			return *this;
+		}
+	};
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logInfo
+	{
+		logInfo(){}
+		~logInfo(){*(Impl::getInfoStreamInstance()) << std::endl;}
+
+		template<class T>
+		logInfo &operator<<(const T &x)
+		{
+			*(Impl::getInfoStreamInstance()) << x;
+			return *this;
+		}
+	};
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logWarning
+	{
+		logWarning(){}
+		~logWarning(){*(Impl::getWarningStreamInstance()) << std::endl;}
+
+		template<class T>
+		logWarning &operator<<(const T &x)
+		{
+			*(Impl::getWarningStreamInstance()) << x;
+			return *this;
+		}
+	};
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logError
+	{
+		logError(){}
+		~logError(){*(Impl::getErrorStreamInstance()) << std::endl;}
+
+		template<class T>
+		logError &operator<<(const T &x)
+		{
+			*(Impl::getErrorStreamInstance()) << x;
+			return *this;
+		}
+	};
+
+	// Automatically appending 'std::endl' as described here: http://stackoverflow.com/a/2179782
+	struct logFatal
+	{
+		logFatal(){}
+		~logFatal(){*(Impl::getFatalStreamInstance()) << std::endl;}
+
+		template<class T>
+		logFatal &operator<<(const T &x)
+		{
+			*(Impl::getFatalStreamInstance()) << x;
+			return *this;
+		}
+	};
+}
+
+#ifdef POLYVOX_LOG_TRACE_ENABLED
+
+	#define POLYVOX_LOG_TRACE(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getTraceStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_TRACE_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getTraceStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_TRACE(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_TRACE_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#ifdef POLYVOX_LOG_DEBUG_ENABLED
+
+	#define POLYVOX_LOG_DEBUG(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getDebugStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_DEBUG_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getDebugStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_DEBUG(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_DEBUG_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#ifdef POLYVOX_LOG_INFO_ENABLED
+
+	#define POLYVOX_LOG_INFO(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getInfoStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_INFO_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getInfoStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_INFO(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_INFO_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#ifdef POLYVOX_LOG_WARNING_ENABLED
+
+	#define POLYVOX_LOG_WARNING(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getWarningStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_WARNING_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getWarningStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_WARNING(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_WARNING_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#ifdef POLYVOX_LOG_ERROR_ENABLED
+
+	#define POLYVOX_LOG_ERROR(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getErrorStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_ERROR_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getErrorStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_ERROR(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_ERROR_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#ifdef POLYVOX_LOG_FATAL_ENABLED
+
+		#define POLYVOX_LOG_FATAL(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			/* Appending the 'std::endl' forces the stream to be flushed. */ \
+			*(PolyVox::Impl::getFatalStreamInstance()) << (message) << std::endl; \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+	#define POLYVOX_LOG_FATAL_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do \
+		{ \
+			if ((condition)) \
+			{ \
+				/* Appending the 'std::endl' forces the stream to be flushed. */ \
+				*(PolyVox::Impl::getFatalStreamInstance()) << (message) << std::endl; \
+			} \
+		} while(0) \
+		POLYVOX_MSC_WARNING_POP
+
+#else
+
+	#define POLYVOX_LOG_FATAL(message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+	#define POLYVOX_LOG_FATAL_IF(condition, message) \
+		/* We use the do...while(0) construct in our macros (for reasons see here: http://stackoverflow.com/a/154138) \
+		   but Visual Studio gives unhelpful 'conditional expression is constant' warnings. The recommended solution \
+		   (http://stackoverflow.com/a/1946485) is to disable these warnings. */ \
+		POLYVOX_MSC_WARNING_PUSH \
+		POLYVOX_DISABLE_MSC_WARNING(4127) \
+		do { POLYVOX_UNUSED(condition); POLYVOX_UNUSED(message); } while(0) \
+		POLYVOX_MSC_WARNING_POP	
+
+#endif
+
+#endif //__PolyVox_Logging_H__

library/PolyVoxCore/source/Impl/ErrorHandling.cpp

@@ -25,93 +25,6 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	/** 
-	 * \return A pointer to the null stream.
-	 */
-	std::ostream* getNullStream(void)
-	{
-		// Passing zero to the stream constructor guarentees it will discard all input. See
-		// here http://stackoverflow.com/a/8244052 and here http://stackoverflow.com/a/6240980
-		static std::ostream s_NullStream(0);
-		return &s_NullStream;
-	}
-
-	// These create the global stream instances, created on demand.
-	namespace Impl
-	{
-		std::ostream*& getTraceStreamInstance()
-		{
-			static std::ostream* s_pTraceStream = getNullStream();
-			return s_pTraceStream;
-		}
-
-		std::ostream*& getDebugStreamInstance()
-		{
-			static std::ostream* s_pDebugStream = getNullStream();
-			return s_pDebugStream;
-		}
-
-		std::ostream*& getInfoStreamInstance()
-		{
-			static std::ostream* s_pInfoStream = &(std::cout);
-			return s_pInfoStream;
-		}
-
-		std::ostream*& getWarningStreamInstance()
-		{
-			static std::ostream* s_pWarningStream = &(std::cerr);
-			return s_pWarningStream;
-		}
-
-		std::ostream*& getErrorStreamInstance()
-		{
-			static std::ostream* s_pErrorStream = &(std::cerr);
-			return s_pErrorStream;
-		}
-
-		std::ostream*& getFatalStreamInstance()
-		{
-			static std::ostream* s_pFatalStream = &(std::cerr);
-			return s_pFatalStream;
-		}
-	}
-
-	void setTraceStream(std::ostream* pStream)
-	{
-		Impl::getTraceStreamInstance() = pStream;
-	}
-
-	void setDebugStream(std::ostream* pStream)
-	{
-		Impl::getDebugStreamInstance() = pStream;
-	}
-
-	void setInfoStream(std::ostream* pStream)
-	{
-		Impl::getInfoStreamInstance() = pStream;
-	}
-
-	void setWarningStream(std::ostream* pStream)
-	{
-		Impl::getWarningStreamInstance() = pStream;
-	}
-
-	void setErrorStream(std::ostream* pStream)
-	{
-		Impl::getErrorStreamInstance() = pStream;
-	}
-
-	// Fatal stream for logging
-	std::ostream*& getFatalStreamInstance()
-	{
-		static std::ostream* s_pFatalStream = &(std::cerr);
-		return s_pFatalStream;
-	}
-
-	void setFatalStream(std::ostream* pStream)
-	{
-		getFatalStreamInstance() = pStream;
-	}
 
 #ifndef POLYVOX_THROW_ENABLED
 	void defaultThrowHandler(std::exception& e, const char* file, int line)

library/PolyVoxCore/source/Impl/Logging.cpp

@@ -0,0 +1,115 @@
+/*******************************************************************************
+Copyright (c) 2005-2009 David Williams and Matthew Williams
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution. 	
+*******************************************************************************/
+
+#include "PolyVoxCore/Impl/Logging.h"
+
+namespace PolyVox
+{
+	/** 
+	 * \return A pointer to the null stream.
+	 */
+	std::ostream* getNullStream(void)
+	{
+		// Passing zero to the stream constructor guarentees it will discard all input. See
+		// here http://stackoverflow.com/a/8244052 and here http://stackoverflow.com/a/6240980
+		static std::ostream s_NullStream(0);
+		return &s_NullStream;
+	}
+
+	// These create the global stream instances, created on demand.
+	namespace Impl
+	{
+		std::ostream*& getTraceStreamInstance()
+		{
+			static std::ostream* s_pTraceStream = getNullStream();
+			return s_pTraceStream;
+		}
+
+		std::ostream*& getDebugStreamInstance()
+		{
+			static std::ostream* s_pDebugStream = getNullStream();
+			return s_pDebugStream;
+		}
+
+		std::ostream*& getInfoStreamInstance()
+		{
+			static std::ostream* s_pInfoStream = &(std::cout);
+			return s_pInfoStream;
+		}
+
+		std::ostream*& getWarningStreamInstance()
+		{
+			static std::ostream* s_pWarningStream = &(std::cerr);
+			return s_pWarningStream;
+		}
+
+		std::ostream*& getErrorStreamInstance()
+		{
+			static std::ostream* s_pErrorStream = &(std::cerr);
+			return s_pErrorStream;
+		}
+
+		std::ostream*& getFatalStreamInstance()
+		{
+			static std::ostream* s_pFatalStream = &(std::cerr);
+			return s_pFatalStream;
+		}
+	}
+
+	void setTraceStream(std::ostream* pStream)
+	{
+		Impl::getTraceStreamInstance() = pStream;
+	}
+
+	void setDebugStream(std::ostream* pStream)
+	{
+		Impl::getDebugStreamInstance() = pStream;
+	}
+
+	void setInfoStream(std::ostream* pStream)
+	{
+		Impl::getInfoStreamInstance() = pStream;
+	}
+
+	void setWarningStream(std::ostream* pStream)
+	{
+		Impl::getWarningStreamInstance() = pStream;
+	}
+
+	void setErrorStream(std::ostream* pStream)
+	{
+		Impl::getErrorStreamInstance() = pStream;
+	}
+
+	// Fatal stream for logging
+	std::ostream*& getFatalStreamInstance()
+	{
+		static std::ostream* s_pFatalStream = &(std::cerr);
+		return s_pFatalStream;
+	}
+
+	void setFatalStream(std::ostream* pStream)
+	{
+		getFatalStreamInstance() = pStream;
+	}
+}