[pclasses-cvs] pclasses2/include/pclasses Trace.h,1.2,1.3

[Christian P. <cp...@us...>]

Update of /cvsroot/pclasses/pclasses2/include/pclasses
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10913/include/pclasses

Modified Files:
	Trace.h 
Log Message:
- Added a this-pointer to P_TRACE macro.
- Added a P_TRACE_GLOBAL macro without this-pointer.


Index: Trace.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Trace.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Trace.h	28 Apr 2005 10:11:36 -0000	1.2
+++ Trace.h	6 May 2005 15:26:24 -0000	1.3
@@ -37,7 +37,9 @@
 	private std::ostream
 {
 	public:
-		TraceStream(TraceLog& log, const SourceInfo& si, const char* cl);
+		TraceStream(TraceLog& log, const SourceInfo& si, const char* cl, 
+			const void* obj);
+		TraceStream(TraceLog& log, const SourceInfo& si);
 		TraceStream(const TraceStream&);
 		~TraceStream();
 
@@ -47,14 +49,20 @@
 		TraceLog&   _log;
 		SourceInfo  _src;
 		std::string _class;
+		const void* _obj;
 };
 
 class PCORE_EXPORT TraceLog {
 	public:
-		TraceStream stream(const SourceInfo& si, const char* cl);
+		TraceStream stream(const SourceInfo& si, const char* cl,
+			const void* obj);
+
+		TraceStream stream(const SourceInfo& si);
+
+		void output(const SourceInfo& si, const std::string& msg);
 
 		void output(const SourceInfo& si, const std::string& cl,
-			const std::string& msg);
+			const void* obj, const std::string& msg);
 
 		static TraceLog& instance();
 
@@ -106,8 +114,10 @@
 
 #if defined(_DEBUG) && !defined(NO_DEBUG)
 #  define P_TRACE(c) NullTraceStream()
+#  define P_TRACE_GLOBAL(c) NullTraceStream()
 #else
-#  define P_TRACE(c) P::TraceLog::instance().stream(P_SOURCEINFO,#c)()
+#  define P_TRACE(c) P::TraceLog::instance().stream(P_SOURCEINFO,#c,this)()
+#  define P_TRACE_GLOBAL(c) P::TraceLog::instance().stream(P_SOURCEINFO)()
 #endif
 
 } // !namespace P