[pclasses-cvs] pclasses2/src/SIO Makefile.toc,1.3,1.4 registrations.cpp,1.2,1.3 SIO.h,1.1,1.2

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

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

Modified Files:
	Makefile.toc registrations.cpp SIO.h 
Log Message:
Reverted from S11nNode "fat" type to s11n_node, because:
a) it introduces a circular dep on nodes and serializables.
b) since it inherits a Serializabe, it is Serializable, and a Serializable node logically makes no sense. Nodes ARE the state, and we don't save the state of the state.

Index: Makefile.toc
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/SIO/Makefile.toc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.toc	31 Dec 2004 16:15:57 -0000	1.3
+++ Makefile.toc	31 Dec 2004 17:41:59 -0000	1.4
@@ -7,11 +7,12 @@
 
 SOURCES = \
 	registrations.cpp \
-	S11nNode.cpp \
 	SIO.cpp
 
+# S11nNode.cpp
 
-HEADERS = $(wildcard *.h)
+HEADERS = SIO.h
+# $(wildcard *.h)
 
 
 OBJECTS = $(patsubst %.cpp,%.o,$(SOURCES))

Index: registrations.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/SIO/registrations.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- registrations.cpp	31 Dec 2004 16:15:57 -0000	1.2
+++ registrations.cpp	31 Dec 2004 17:41:59 -0000	1.3
@@ -6,7 +6,6 @@
 #include <pclasses/pclasses-config.h> // PCLASSES_HAVE_LIBEXPAT
 
 #include <pclasses/SIO/SIO.h>
-#include <pclasses/SIO/S11nNode.h>
 
 #ifdef PCLASSES_HAVE_LIBEXPAT
 // KLUDGE until i get S11nNode fully integrated...

Index: SIO.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/SIO/SIO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SIO.h	29 Dec 2004 19:54:44 -0000	1.1
+++ SIO.h	31 Dec 2004 17:41:59 -0000	1.2
@@ -27,7 +27,7 @@
 #include <pclasses/s11n/s11n.h>
 #include <pclasses/s11n/io/serializers.h>
 #include <pclasses/Plugin/Plugin.h>
-#include <pclasses/SIO/S11nNode.h>
+// #include <pclasses/SIO/S11nNode.h>
 
 namespace P {
 
@@ -56,6 +56,7 @@
 namespace SIO
 {
 
+	typedef ::P::s11n::s11n_node S11nNode;
 	/**
 	   NodeTraits provide the interface for fetching and
 	   manipulating S11nNode data.