Menu
▾
▴
libfunutil-cvs
Update of /cvsroot/libfunutil/libfunutil/client/s11nconvert
In directory sc8-pr-cvs1:/tmp/cvs-serv7754
Modified Files:
Makefile ns.AltSerializable.cpp ns.AltSerializable.h
ns.BarClass.cpp ns.BarClass.h ns.FooClass.cpp ns.FooClass.h
ns.main.cpp ns.maser.cpp
Log Message:
build fixes
Index: Makefile
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 17 Nov 2003 22:00:45 -0000 1.5
+++ Makefile 19 Nov 2003 23:08:33 -0000 1.6
@@ -25,10 +25,10 @@
CLEAN_FILES += main2.*
main.o: Makefile
tip: FORCE
- @echo -e "tip: build with\n\tALTS11N=classname ${MAKE}\nto set the default Serializable implementation used (e.g.) by the -d option.";\
- echo "The current Serializable type is $(SERIALIZABLE_TYPE)."
+ @echo -e "tip: build with\n\tALTS11N=classname ${MAKE}\nto set the default serializable implementation used (e.g.) by the -d option.";\
+ echo "The current serializable type is $(SERIALIZABLE_TYPE)."
-SERIALIZABLE_TYPE = $(S11N_NAMESPACE)::Serializable
+SERIALIZABLE_TYPE = $(S11N_NAMESPACE)::serializable
ifeq (1,${ALTS11N})
SERIALIZABLE_TYPE = alts11n::AltSerializable
else
Index: ns.AltSerializable.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.AltSerializable.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.AltSerializable.cpp 17 Nov 2003 22:00:45 -0000 1.2
+++ ns.AltSerializable.cpp 19 Nov 2003 23:08:33 -0000 1.3
@@ -8,7 +8,7 @@
/**
A test class for demonstrating the ability to use
- non-S11N_NAMESPACE::Serializable types with the s11n framework.
+ non-S11N_NAMESPACE::serializable types with the s11n framework.
*/
namespace alts11n {
AltSerializable::AltSerializable(){};
Index: ns.AltSerializable.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.AltSerializable.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.AltSerializable.h 17 Nov 2003 22:00:45 -0000 1.2
+++ ns.AltSerializable.h 19 Nov 2003 23:08:33 -0000 1.3
@@ -5,7 +5,7 @@
#include <S11N_NAMESPACE/s11n_node.h>
/**
A test class for demonstrating the ability to use
- non-S11N_NAMESPACE::Serializable types with the s11n framework.
+ non-S11N_NAMESPACE::serializable types with the s11n framework.
*/
namespace alts11n {
class AltSerializable
@@ -41,7 +41,7 @@
/**
This creates the required serializable_adapter<AltSerializable>
specializations to map the AltSerializable API to
- Serializable's. This is all it takes to make the framework able to
+ serializable's. This is all it takes to make the framework able to
use AltSerializable. You may provide your own implementation,
instead of using this macro, and you must do so if your
de/serialize() function signatures differ from the defaults.
Index: ns.BarClass.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.BarClass.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.BarClass.cpp 17 Nov 2003 22:00:45 -0000 1.2
+++ ns.BarClass.cpp 19 Nov 2003 23:08:33 -0000 1.3
@@ -21,7 +21,7 @@
bool BarClass::s7e( s11n_node & ser ) const
{
- if ( !this->Serializable::s7e( ser ) )
+ if ( !this->serializable::s7e( ser ) )
return false;
ser.set( "name", this->name );
ser.set( "magic_number", magic_number );
Index: ns.BarClass.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.BarClass.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.BarClass.h 17 Nov 2003 22:00:46 -0000 1.2
+++ ns.BarClass.h 19 Nov 2003 23:08:33 -0000 1.3
@@ -4,9 +4,9 @@
using namespace S11N_NAMESPACE;
using namespace std;
// #include <S11N_NAMESPACE/serializable_adapter.h>
-#include <S11N_NAMESPACE/Serializable.h>
+#include <S11N_NAMESPACE/serializable.h>
-struct BarClass: public S11N_NAMESPACE::Serializable
+struct BarClass: public S11N_NAMESPACE::serializable
{
std::string name;
int magic_number;
@@ -16,4 +16,4 @@
virtual bool d9e( const S11N_NAMESPACE::s11n_node & node );
};
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,BarClass);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,BarClass);
Index: ns.FooClass.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.FooClass.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.FooClass.cpp 17 Nov 2003 22:00:46 -0000 1.2
+++ ns.FooClass.cpp 19 Nov 2003 23:08:33 -0000 1.3
@@ -24,8 +24,8 @@
} // namespace foo
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,foo::BarClass);
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,foo::Baz);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,foo::BarClass);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,foo::Baz);
namespace {
@@ -37,7 +37,7 @@
int dll_loader_bootstrap()
{
CERR << "dll_loader_bootstrap()" << endl;
- typedef S11N_NAMESPACE::class_loader<S11N_NAMESPACE::Serializable> CL;
+ typedef S11N_NAMESPACE::class_loader<S11N_NAMESPACE::serializable> CL;
CL::register_subtype<foo::FooClass>("foo::WonderBra");
return 0;
}
@@ -63,7 +63,7 @@
bool FooClass::s7e( s11n_node & node ) const
{
- if ( !this->Serializable::s7e( node ) ) return false;
+ if ( !this->serializable::s7e( node ) ) return false;
node.set( "name", this->name );
node.serialize_list( "vector", this->m_vec );
return true;
@@ -74,7 +74,7 @@
{
this->m_vec.clear();
CERR <<"deserialize() impl_class="<<node.impl_class() << std::endl;
- if ( !this->Serializable::d9e( node ) ) return false;
+ if ( !this->serializable::d9e( node ) ) return false;
this->name = node.get( "name", "<unnamed>" );
node.deserialize_list( "vector", this->m_vec );
CERR << "m_vec size = " << m_vec.size() << std::endl;
Index: ns.FooClass.h
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.FooClass.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.FooClass.h 17 Nov 2003 22:00:46 -0000 1.2
+++ ns.FooClass.h 19 Nov 2003 23:08:33 -0000 1.3
@@ -2,11 +2,11 @@
#define FOO_H_INCLUDED 1
#include <S11N_NAMESPACE/s11n_node.h>
-#include <S11N_NAMESPACE/Serializable.h>
+#include <S11N_NAMESPACE/serializable.h>
#include <vector>
namespace foo {
- struct FooClass : public S11N_NAMESPACE::Serializable
+ struct FooClass : public S11N_NAMESPACE::serializable
{
std::vector<int> m_vec;
std::string name;
@@ -21,6 +21,6 @@
};
}; // namespace foo
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,foo::FooClass);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,foo::FooClass);
#endif // FOO_H_INCLUDED
Index: ns.main.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.main.cpp 17 Nov 2003 22:00:47 -0000 1.2
+++ ns.main.cpp 19 Nov 2003 23:08:33 -0000 1.3
@@ -30,9 +30,9 @@
#include <S11N_NAMESPACE/serializer_loader.h>
#include <S11N_NAMESPACE/node_loader.h>
-#include <S11N_NAMESPACE/Serializable.h>
+#include <S11N_NAMESPACE/serializable.h>
// #include <S11N_NAMESPACE/serializable_adapter.h>
-// SERIALIZABLE_ADAPTER(S11N_NAMESPACE::Serializable,s7e,d9e);
+// SERIALIZABLE_ADAPTER(S11N_NAMESPACE::serializable,s7e,d9e);
// #include <S11N_NAMESPACE/include_from_main.h>
@@ -56,10 +56,10 @@
#endif
#ifndef SERIALIZABLE_TYPE
-# define SERIALIZABLE_TYPE S11N_NAMESPACE::Serializable
+# define SERIALIZABLE_TYPE S11N_NAMESPACE::serializable
#endif
#ifndef SERIALIZABLE_TYPE_STRING
-# define SERIALIZABLE_TYPE_STRING "S11N_NAMESPACE::Serializable"
+# define SERIALIZABLE_TYPE_STRING "S11N_NAMESPACE::serializable"
#endif
@@ -99,7 +99,7 @@
Garbage In, Garbage Out. For generating lots of junk serialized
data quickly.
*/
-class GIGO : public S11N_NAMESPACE::Serializable
+class GIGO : public S11N_NAMESPACE::serializable
{
public:
typedef std::map<int,std::string> IntStrMap;
@@ -176,7 +176,7 @@
virtual bool s7e( s11n_node & node ) const
{
- if( ! this->Serializable::s7e( node ) ) return false;
+ if( ! this->serializable::s7e( node ) ) return false;
static long depth = 0;
++depth;
GIGOVERBOSE << "GIG0::serialize()" << std::endl;
@@ -192,7 +192,7 @@
}
virtual bool d9e( const s11n_node & node )
{
- if( ! this->Serializable::d9e( node ) ) return false;
+ if( ! this->serializable::d9e( node ) ) return false;
static long depth = 0;
++depth;
@@ -232,7 +232,7 @@
/**
Register with the framework:
*/
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,GIGO);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,GIGO);
/**
A test namespace.
@@ -242,14 +242,14 @@
/**
A test class.
*/
- struct FakeRoot : public S11N_NAMESPACE::Serializable
+ struct FakeRoot : public S11N_NAMESPACE::serializable
{
std::string m_foo;
std::string m_bar;
typedef std::map<double,std::string> IntStrMap;
typedef std::map<double,std::string> DblStrMap;
- typedef pointer_list < S11N_NAMESPACE::Serializable > FakeVec;
+ typedef pointer_list < S11N_NAMESPACE::serializable > FakeVec;
//typedef std::vector<BarClass *> FakeVec;
FakeVec m_vec;
FakeRoot()
@@ -263,7 +263,7 @@
virtual bool s7e( s11n_node & node ) const
{
VERBOSE << "FakeRoot::serialize()" << std::endl;
- if ( !this->Serializable::s7e( node ) ) return false;
+ if ( !this->serializable::s7e( node ) ) return false;
node.set( "foo", m_foo );
node.set( "bar", m_bar );
node.serialize_children( "childs", m_vec );
@@ -280,7 +280,7 @@
VERBOSE << "theother=="<<std::hex<<theother<<std::endl;
delete( theother );
m_vec.delete_all();
- // node.deserialize_children<S11N_NAMESPACE::Serializable>( "foo_child", m_vec );
+ // node.deserialize_children<S11N_NAMESPACE::serializable>( "foo_child", m_vec );
unsigned long count = 0;
count = node.deserialize_children( "foo_child", m_vec );
VERBOSE << "deser: foo_child count: "<<count<<", and m_vec.size() says: " << m_vec.size() << std::endl;
@@ -311,7 +311,7 @@
};
}; // namespace fake
-SERIALIZABLE_REGISTER(S11N_NAMESPACE::Serializable,fake::FakeRoot);
+SERIALIZABLE_REGISTER(S11N_NAMESPACE::serializable,fake::FakeRoot);
s11n_node *gigo( unsigned int gcount )
@@ -342,7 +342,7 @@
out << "s11n library version: " << std::endl;
out << "\tCompiled for: " << S11N_LIBRARY_VERSION << std::endl;
out << "\tRunning with: " << S11N_NAMESPACE::library_version() << std::endl;
- out << "Serializer interface: " << SERIALIZABLE_TYPE_STRING << std::endl;
+ out << "serializer interface: " << SERIALIZABLE_TYPE_STRING << std::endl;
out << "License: " << PACKAGE_LICENSE << std::endl;
#define VERSION_SHORTCUT 0
@@ -352,17 +352,17 @@
CERR << "load_serializable<"<<# ST<<">("<<FN<<") = " << std::hex<<root << std::endl; \
delete( root );
- S11N_NAMESPACE::Serializable * root = 0;
+ S11N_NAMESPACE::serializable * root = 0;
// fake::FakeRoot * root = 0;
std::string infile = "in.s11n";
LOAD_SERIALIZABLE(fake::FakeRoot,infile);
- LOAD_SERIALIZABLE(S11N_NAMESPACE::Serializable,"in.s11n");
+ LOAD_SERIALIZABLE(S11N_NAMESPACE::serializable,"in.s11n");
// fake::FakeRoot root;
// s11n_node node;
// node.serialize( "fake", root );
// node.serialize( "gigo", GIGO() );
-// ParenSerializer serializer;
+// paren_serializer serializer;
// serializer.serialize( node, std::cerr );
// fake::FakeRoot * clone = s11n_clone( root );
// serializer.basic_serializer::serialize( "boo", *clone, std::cerr ); // WTF must i qualify that???
@@ -459,7 +459,7 @@
args.set_help( "nodedebug", "enable s11n_node debug output" );
- if( "S11N_NAMESPACE::Serializable" == SERIALIZABLE_TYPE_STRING )
+ if( "S11N_NAMESPACE::serializable" == SERIALIZABLE_TYPE_STRING )
{
args.set_help( "sopath path", "Sets the classloader path. Use a :-delimited list." );
}
@@ -501,7 +501,7 @@
ERRUR(ErrorMultipleCompressors,"Both -bz and -z were specified.");
#endif
ERRUR(ErrorCloningFailed,"the -dc command failed.");
- std::cout << "\n[Serializer interface=" << SERIALIZABLE_TYPE_STRING << "]"<<std::endl;
+ std::cout << "\n[serializer interface=" << SERIALIZABLE_TYPE_STRING << "]"<<std::endl;
std::cout << std::endl;
return ErrorHelp;
@@ -619,9 +619,9 @@
S8rLoader::register_subtype<FunXMLSerializer>( XMLFormat );
S8rLoader::register_subtype<SimpleXMLSerializer>( SimpleXMLFormat );
S8rLoader::register_subtype<FunTxtSerializer>( TextFormat );
- S8rLoader::register_subtype<ParenSerializer>( ParenFormat );
-// S8rLoader::register_subtype<HexSerializer>( HexFormat );
- S8rLoader::register_subtype<CompactSerializer>( CompactFormat );
+ S8rLoader::register_subtype<paren_serializer>( ParenFormat );
+// S8rLoader::register_subtype<hex_serializer>( HexFormat );
+ S8rLoader::register_subtype<compact_serializer>( CompactFormat );
serializer = S8rLoader::load_class( outmode );
@@ -629,7 +629,7 @@
{ // deserialize the data?
// typedef class_loader<base_serializable_adapter> AdCL;
-// AdCL::value_type * whoa = AdCL::load_class( //"serializable_adapter<S11N_NAMESPACE::Serializable>"
+// AdCL::value_type * whoa = AdCL::load_class( //"serializable_adapter<S11N_NAMESPACE::serializable>"
// std::string( "serializable_adapter<" ) +
// std::string( SERIALIZABLE_TYPE_STRING ) +
// std::string( ">" )
@@ -638,7 +638,7 @@
// CERR << "impl_class()="<<whoa->impl_class() << std::endl;
// CERR <<typeid(*whoa).name() << std::endl;
// now what? we still can't get the exact TYPE we need at runtime, because
- // various Serializables necessarily decend from different bases :(
+ // various serializables necessarily decend from different bases :(
//typedef alts11n::AltSerializable serializable_type;
typedef SERIALIZABLE_TYPE serializable_type;
@@ -688,7 +688,7 @@
else if( serializer )
{
workie = serializer->serialize( *root, *os );
- if( ! workie ) failreason = "Serializer's serialize() failed!";
+ if( ! workie ) failreason = "serializer's serialize() failed!";
}
Index: ns.maser.cpp
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/client/s11nconvert/ns.maser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ns.maser.cpp 17 Nov 2003 22:00:48 -0000 1.2
+++ ns.maser.cpp 19 Nov 2003 23:08:33 -0000 1.3
@@ -29,18 +29,18 @@
#include <S11N_NAMESPACE/node_loader.h>
-#include <S11N_NAMESPACE/Serializable.h>
-#include <S11N_NAMESPACE/Serializer.h>
+#include <S11N_NAMESPACE/serializable.h>
+#include <S11N_NAMESPACE/serializer.h>
#if HAVE_CONFIG_H
# include "config.h" // S11N_LIBRARY_VERSION, PACKAGE_{VERSION,NAME}
#endif
#ifndef SERIALIZABLE_TYPE
-# define SERIALIZABLE_TYPE S11N_NAMESPACE::Serializable
+# define SERIALIZABLE_TYPE S11N_NAMESPACE::serializable
#endif
#ifndef SERIALIZABLE_TYPE_STRING
-# define SERIALIZABLE_TYPE_STRING "S11N_NAMESPACE::Serializable"
+# define SERIALIZABLE_TYPE_STRING "S11N_NAMESPACE::serializable"
#endif
@@ -233,7 +233,7 @@
out << "s11n library version: " << std::endl;
out << "\tCompiled for: " << S11N_LIBRARY_VERSION << std::endl;
out << "\tRunning with: " << S11N_NAMESPACE::library_version() << std::endl;
- out << "Serializer interface: " << SERIALIZABLE_TYPE_STRING << std::endl;
+ out << "serializer interface: " << SERIALIZABLE_TYPE_STRING << std::endl;
out << "License: " << PACKAGE_LICENSE << std::endl;
}
@@ -269,7 +269,7 @@
args.set_help( "q, quiet", "disable some warnings." );
args.set_help( "v, verbose", "enable some extra output." );
- if( "S11N_NAMESPACE::Serializable" == SERIALIZABLE_TYPE_STRING )
+ if( "S11N_NAMESPACE::serializable" == SERIALIZABLE_TYPE_STRING )
{
args.set_help( "sopath path", "Sets the classloader path. Use a :-delimited list." );
}
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X