[qub-cvstree] CVS: eshell/lib/eshell eshell.cpp,1.5,1.6 object_pool.h,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/qub/eshell/lib/eshell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11600/lib/eshell

Modified Files:
	eshell.cpp object_pool.h 
Log Message:
mass commit, so i can work from the office.

Index: eshell.cpp
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/eshell.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eshell.cpp	31 May 2004 20:05:37 -0000	1.5
+++ eshell.cpp	1 Jun 2004 03:30:58 -0000	1.6
@@ -501,13 +501,13 @@
                 {
                         arguments a = args;
                         std::string arg = a.shift();
-                        int myint = stringutil::from_string( a.shift(), 0 );
+                        int myint = tostring::from_string( a.shift(), 0 );
                         if( 0 >= myint )
                         {
                                 os << "Error: time to sleep to small. You must use a number >= 0." << std::endl;
                                 return 1;
                         }
-                        int noisy = stringutil::from_string( a.shift(), 0 );
+                        int noisy = tostring::from_string( a.shift(), 0 );
 #if ESHELL_USE_SIGNALS
                         typedef void (*signalfunc)(int);
                         signalfunc old_sighandler = ::signal( SIGINT, eshell_SIGINT );

Index: object_pool.h
===================================================================
RCS file: /cvsroot/qub/eshell/lib/eshell/object_pool.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- object_pool.h	31 May 2004 19:56:03 -0000	1.3
+++ object_pool.h	1 Jun 2004 03:30:58 -0000	1.4
@@ -4,10 +4,23 @@
 #include <string>
 #include <map>
 
-#include <s11n.net/s11n/s11n_debuggering_macros.hpp> // COUT/CERR
 #include <s11n.net/cl/cllite.hpp> // classloader framework
 #include <s11n.net/phoenix/phoenix.hpp> // phoenix class
 
+// CERR is a drop-in replacement for std::cerr, but slightly more
+// decorative.
+#ifndef CERR
+#  define CERR std::cerr << __FILE__ << ":" << std::dec << __LINE__ << " : "
+#endif
+
+#ifndef COUT
+#  define COUT std::cout << __FILE__ << ":" << std::dec << __LINE__ << " : "
+#endif
+
+
+#endif //  DEBUGGERING_MACROS_H
+
+
 namespace eshell {
 
         /**