[pclasses-cvs] pclasses2/include/pclasses Factory.h,1.20,1.21

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

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

Modified Files:
	Factory.h 
Log Message:
- Use new tracing macro


Index: Factory.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Factory.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Factory.h	15 Jan 2005 23:40:22 -0000	1.20
+++ Factory.h	28 Apr 2005 10:35:39 -0000	1.21
@@ -12,6 +12,7 @@
                               // what happens in some cases when i don't use
                               // phoenix. :/
 #include <pclasses/SharingContext.h>
+#include <pclasses/Trace.h>
 
 namespace P
 {
@@ -276,12 +277,12 @@
 		*/
 		key_type expandAliases( const key_type & _alias ) const
 		{
-			//CERR << "expandAlias("<<_alias<<")\n";
+			P_TRACE(Factory) << "expandAlias("<<_alias<<")";
 			typename AliasMap::const_iterator cit = this->aliases().find( _alias ),
 				cet = this->aliases().end();
 			if( cet == cit )
 			{
-				//CERR << "No alias found for "<<_alias<<"\n";
+				P_TRACE(Factory) << "No alias found for '"<<_alias<<"'";
 				return _alias;
 			}
 			key_type exp = (*cit).second;
@@ -290,13 +291,13 @@
 				cit = this->aliases().find( exp );
 				if( cet == cit )
 				{
-					// CERR << "Returning '"<<_alias<<"' unaliased: " << exp<<"\n";
+					P_TRACE(Factory) << "Returning '"<<_alias<<"' unaliased: '" << exp<<"'";
 					return exp;
 				}
 				exp = (*cit).second;
 				if( exp == _alias )
 				{ // circular aliasing
-					// CERR << "Warning: circular alias '"<<_alias<<"'.";
+					P_TRACE(Factory) << "Warning: circular alias '"<<_alias<<"'.";
 					return exp;
 				}
 			}
@@ -365,7 +366,7 @@
 		*/
 		virtual void registerFactory( const key_type & key, FactoryFuncType fp )
 		{
-			//CERR << "registerFactory("<<key<<",facfunc)\n";
+			P_TRACE(Factory) << "registerFactory("<<key<<",facfunc)";
 			factoryMap().insert( typename FactoryMap::value_type( key, fp ) );
 		}