[pclasses-cvs] pclasses2/src/s11n SIO.cpp,1.4,1.5 SIO.h,1.7,1.8

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

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

Modified Files:
	SIO.cpp SIO.h 
Log Message:
Changed S11nNode typedef to a P-native S11nNode type.

Index: SIO.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/SIO.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SIO.h	27 Dec 2004 23:23:23 -0000	1.7
+++ SIO.h	28 Dec 2004 04:21:41 -0000	1.8
@@ -22,7 +22,7 @@
 #include <pclasses/Plugin/Plugin.h>
 #include <pclasses/s11n/s11n.h>
 #include <pclasses/s11n/io/serializers.h>
-
+#include <pclasses/s11n/S11nNode.h>
 
 namespace P {
 
@@ -62,7 +62,7 @@
 	   fact S11nNode's useful API is all private, so you CAN'T
 	   touch it without going through NodeTraits. :) Gotcha!
 	*/
-	typedef ::P::s11n::s11n_node S11nNode;
+// 	typedef ::P::s11n::s11n_node S11nNode;
 
 	/**
 	   NodeTraits provide the interface for fetching and

Index: SIO.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/SIO.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SIO.cpp	26 Dec 2004 09:44:27 -0000	1.4
+++ SIO.cpp	28 Dec 2004 04:21:41 -0000	1.5
@@ -7,6 +7,12 @@
 #include <pclasses/s11n/s11n_debuggering_macros.h>
 #include <pclasses/pclasses-config.h> // PCLASSES_HAVE_LIBEXPAT
 
+
+#ifdef PCLASSES_HAVE_LIBEXPAT
+// KLUDGE until i get S11nNode fully integrated...
+#  include "io/expat/expat_serializer.h"
+#endif
+
 #define SIO_KEY_DEFAULT_SERIALIZER "/P/SIO/DefaultSerializer"
 namespace P {
 
@@ -23,6 +29,7 @@
 #ifdef PCLASSES_HAVE_LIBEXPAT
 		// @fixme: be more dynamic here, look poking around
 		// libdir/pclasses/*_serializer.so.
+		::P::s11n::io::register_serializer< ::P::s11n::io::expat_serializer< S11nNode > >( "s11n::io::expat_serializer", "expat" );
 		SerializerPluginManager::instance().alias( SIO_KEY_DEFAULT_SERIALIZER, "expat" );
 #endif
 	}