libfunutil-cvs

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

Update of /cvsroot/libfunutil/libfunutil/client/s11nconvert
In directory sc8-pr-cvs1:/tmp/cvs-serv32411/client/s11nconvert

Modified Files:
	Makefile ns.main.cpp ns.maser.cpp 
Log Message:
fixed a class-renaming snaffu caused by a cross-tree blunder

Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	19 Nov 2003 23:08:33 -0000	1.6
+++ Makefile	28 Nov 2003 01:35:48 -0000	1.7
@@ -74,6 +74,7 @@
 NAMESPACE = $(S11N_NAMESPACE)
 NAMESPACE_TOKEN = S11N_NAMESPACE
 NAMESPACE_PREFIX = ns.
+NAMESPACE_FILES = $(wildcard $(NAMESPACE_PREFIX)*)
 include $(toc_makesdir)/NAMESPACE.make
 
 

Index: ns.main.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ns.main.cpp	19 Nov 2003 23:08:33 -0000	1.3
+++ ns.main.cpp	28 Nov 2003 01:35:48 -0000	1.4
@@ -31,6 +31,7 @@
 #include <S11N_NAMESPACE/node_loader.h>
 
 #include <S11N_NAMESPACE/serializable.h>
+#include <S11N_NAMESPACE/serializer.h>
 // #include <S11N_NAMESPACE/serializable_adapter.h>
 // SERIALIZABLE_ADAPTER(S11N_NAMESPACE::serializable,s7e,d9e);
 
@@ -616,9 +617,9 @@
 
         typedef class_loader<basic_serializer,int> S8rLoader;
 
-        S8rLoader::register_subtype<FunXMLSerializer>( XMLFormat );
-        S8rLoader::register_subtype<SimpleXMLSerializer>( SimpleXMLFormat );
-        S8rLoader::register_subtype<FunTxtSerializer>( TextFormat );
+        S8rLoader::register_subtype<funxml_serializer>( XMLFormat );
+        S8rLoader::register_subtype<simplexml_serializer>( SimpleXMLFormat );
+        S8rLoader::register_subtype<funtxt_serializer>( TextFormat );
         S8rLoader::register_subtype<paren_serializer>( ParenFormat );
 //         S8rLoader::register_subtype<hex_serializer>( HexFormat );
         S8rLoader::register_subtype<compact_serializer>( CompactFormat );

Index: ns.maser.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.maser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ns.maser.cpp	19 Nov 2003 23:08:33 -0000	1.3
+++ ns.maser.cpp	28 Nov 2003 01:35:48 -0000	1.4
@@ -59,13 +59,13 @@
 // ^^^^ output unless -q is set
 
 
-class MakeSerializer : public basic_serializer
+class make_serializer : public basic_serializer
 {
 
 public:
         
-        MakeSerializer(){};
-        virtual ~MakeSerializer(){};
+        make_serializer(){};
+        virtual ~make_serializer(){};
 
         virtual s11n_node * deserialize( std::istream & )
         {
@@ -157,7 +157,7 @@
                 }
 
                 os << "#!" << make << "\n";
-                os << "# generated by MakeSerializer\n";
+                os << "# generated by make_serializer\n";
 
 //                 if( node.is_set( "usercode" ) )
 //                 {
@@ -299,7 +299,7 @@
 
         if( args.is_set( "sopath" ) )
         {
-                class_loader<MakeSerializer>().path(true).path( args.get_string( "sopath" ) );
+                class_loader<make_serializer>().path(true).path( args.get_string( "sopath" ) );
         }
 
 //         CERR << "debug level: " << s11n_node::debug_level() << std::endl;
@@ -323,7 +323,7 @@
         }
 
 
-        MakeSerializer outer;
+        make_serializer outer;
         outer.serialize( *node, std::cout );
 
 // 	std::ostream * os = 0;