From f4e03cc5370492ab02e8ae5378af55c30c5aaa79 Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Wed, 29 Jan 2014 21:29:00 +0100
Subject: [PATCH] Macros now call new logging system instead of the old one.

---
 .../include/PolyVoxCore/Impl/Logging.h        | 26 +++++++++----------
 library/PolyVoxCore/source/Impl/Logging.cpp   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
index 4226f2e6..54491825 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
@@ -62,7 +62,7 @@ namespace PolyVox
 		std::ostream m_NullStream;
 	};
 
-	class DefaultLogger : Logger
+	class DefaultLogger : public Logger
 	{
 	public:
 		DefaultLogger() : Logger() {}
@@ -201,7 +201,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getTraceStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getTraceStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -216,7 +216,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getTraceStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getTraceStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
@@ -254,7 +254,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getDebugStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getDebugStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -269,7 +269,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getDebugStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getDebugStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
@@ -307,7 +307,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getInfoStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getInfoStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -322,7 +322,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getInfoStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getInfoStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
@@ -360,7 +360,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getWarningStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getWarningStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -375,7 +375,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getWarningStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getWarningStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
@@ -413,7 +413,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getErrorStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getErrorStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -428,7 +428,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getErrorStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getErrorStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
@@ -466,7 +466,7 @@ namespace PolyVox
 		do \
 		{ \
 			/* Appending the 'std::endl' forces the stream to be flushed. */ \
-			*(PolyVox::Impl::getFatalStreamInstance()) << message << std::endl; \
+			(PolyVox::Impl::getLoggerInstance()->getFatalStream()) << message << std::endl; \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
 
@@ -481,7 +481,7 @@ namespace PolyVox
 			if ((condition)) \
 			{ \
 				/* Appending the 'std::endl' forces the stream to be flushed. */ \
-				*(PolyVox::Impl::getFatalStreamInstance()) << message << std::endl; \
+				(PolyVox::Impl::getLoggerInstance()->getFatalStream()) << message << std::endl; \
 			} \
 		} while(0) \
 		POLYVOX_MSC_WARNING_POP
diff --git a/library/PolyVoxCore/source/Impl/Logging.cpp b/library/PolyVoxCore/source/Impl/Logging.cpp
index 31af87c7..f055f40c 100644
--- a/library/PolyVoxCore/source/Impl/Logging.cpp
+++ b/library/PolyVoxCore/source/Impl/Logging.cpp
@@ -31,7 +31,7 @@ namespace PolyVox
 		// to the header file: http://stackoverflow.com/a/7834555
 		Logger*& getLoggerInstance()
 		{
-			static Logger* s_pLogger = 0;
+			static Logger* s_pLogger = new DefaultLogger;
 			return s_pLogger;
 		}
 	}