Merge branch 'develop' into feature/cubiquity-version

2013-05-24 13:52:21 +02:00
parent d7d3df2197 c1461e7582
commit fcb38f0796
2 changed files with 17 additions and 3 deletions
--- a/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
@ -68,6 +68,9 @@ freely, subject to the following restrictions:

 namespace PolyVox
 {
+	/// Get a stream which will consume all input without outputting anything.
+	std::ostream* getNullStream(void);
+
 	std::ostream& logTrace(void);
 	std::ostream& logDebug(void);
 	std::ostream& logInfo(void);