Revision: 285
http://editopia.svn.sourceforge.net/editopia/?rev=285&view=rev
Author: timdewhirst
Date: 2009-02-05 09:48:54 +0000 (Thu, 05 Feb 2009)
Log Message:
-----------
cinesuite
* avoid error from redefinition of *_LOG
Modified Paths:
--------------
cinesuite/cineplay-cinecode/trunk/src/log.hpp
Modified: cinesuite/cineplay-cinecode/trunk/src/log.hpp
===================================================================
--- cinesuite/cineplay-cinecode/trunk/src/log.hpp 2009-01-29 14:36:36 UTC (rev 284)
+++ cinesuite/cineplay-cinecode/trunk/src/log.hpp 2009-02-05 09:48:54 UTC (rev 285)
@@ -23,9 +23,7 @@
// std
#include <iosfwd>
-#include <sstream>
#include <string>
-#include <signal.h>
/// Basic logging class; don't use directly, but rather through
/// the Log::Debug, Log::Warning, Log::Critical
@@ -62,9 +60,32 @@
std::ostream* os_;
};
+#ifdef STANDARD_PREAMBLE
+#undef STANDARD_PREAMBLE
+#endif
#define STANDARD_PREAMBLE __FILE__ << ", L" << __LINE__ << ", " << __FUNCTION__ << ":"
+
+#ifdef DEBUG_LOG
+#undef DEBUG_LOG
+#endif
#define DEBUG_LOG Log( Log::Debug( 3, "debug: " ) ) << STANDARD_PREAMBLE
+
+#ifdef DEBUG_LOG_V
+#undef DEBUG_LOG_V
+#endif
#define DEBUG_LOG_V Log( Log::Debug( 4, "debug: " ) ) << STANDARD_PREAMBLE
+
+#ifdef DEBUG_LOG_VV
+#undef DEBUG_LOG_VV
+#endif
#define DEBUG_LOG_VV Log( Log::Debug( 5, "debug: " ) ) << STANDARD_PREAMBLE
+
+#ifdef WARNING_LOG
+#undef WARNING_LOG
+#endif
#define WARNING_LOG Log( Log::Warning( "warning: " ) ) << STANDARD_PREAMBLE
+
+#ifdef CRITICAL_LOG
+#undef CRITICAL_LOG
+#endif
#define CRITICAL_LOG Log( Log::Critical( "critical: " ) ) << STANDARD_PREAMBLE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|