[pclasses-cvs] pclasses2/src/s11n Makefile.toc,1.6,1.7 s11n_node.h,1.4,1.5

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

Update of /cvsroot/pclasses/pclasses2/src/s11n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21948/src/s11n

Modified Files:
	Makefile.toc s11n_node.h 
Log Message:
Mass commit: ported 2 s11n mini-libs (stringutil, str) into P::StringTool.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/Makefile.toc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.toc	26 Dec 2004 07:53:19 -0000	1.6
+++ Makefile.toc	26 Dec 2004 12:30:05 -0000	1.7
@@ -9,8 +9,9 @@
 	data_node.cpp \
 	s11n.cpp \
 	s11n_node.cpp \
-	SIO.cpp \
-	string_util.cpp
+	SIO.cpp
+
+#	string_util.cpp
 
 HEADERS = $(wildcard *.h)
 
@@ -20,7 +21,6 @@
 	s11n \
 	s11n_node \
 	SIO \
-	string_util \
 	)
 
 objects: $(OBJECTS)

Index: s11n_node.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n_node.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- s11n_node.h	26 Dec 2004 09:15:02 -0000	1.4
+++ s11n_node.h	26 Dec 2004 12:30:05 -0000	1.5
@@ -11,8 +11,10 @@
 #include <map>
 
 #include <vector>
-#include "str.h" // to/from() string
+// #include "str.h" // to/from() string
 #include "traits.h" // node_traits
+#include <pclasses/Util/StringTool.h>
+
 namespace P { namespace s11n {
 
 	/**
@@ -241,7 +243,7 @@
                 template < typename T >
                 void set( const std::string & key, const T & val )
 		{
-			this->m_map[key] = str::to(val);
+			this->m_map[key] = ::P::StringTool::to(val);
 		}
 
 		/**
@@ -260,7 +262,7 @@
                 T get( const std::string & key, const T & defaultval ) const
 		{
                         const_iterator cit = this->m_map.find( key );
-                        return ( this->m_map.end() == cit ) ? defaultval : str::from( (*cit).second, defaultval);
+                        return ( this->m_map.end() == cit ) ? defaultval : ::P::StringTool::from( (*cit).second, defaultval);
 		}
 
                 /**