Menu
▾
▴
[pclasses-cvs] pclasses2/src/s11n Makefile.toc,1.1,1.2 abstract_creator.h,1.1,1.2 algo.h,1.1,1.2 classload.h,1.1,1.2 data_node.cpp,1.1,1.2 data_node.h,1.1,1.2 data_node_algo.h,1.1,1.2 data_node_functor.h,1.1,1.2 data_node_serialize.h,1.1,1.2 functor.h,1.1,1.2 list.h,1.1,1.2 map.h,1.1,1.2 pointer_stripper.h,1.1,1.2 reg_list_specializations.h,1.1,1.2 reg_map_specializations.h,1.1,1.2 reg_serializable_traits.h,1.1,1.2 s11n.cpp,1.1,1.2 s11n.h,1.1,1.2 s11n_debuggering_macros.h,1.1,1.2 s11n_node.cpp,1.1,1.2 s11n_node.h,1.1,1.2 traits.h,1.1,1.2 valarray.h,1.1,1.2
Update of /cvsroot/pclasses/pclasses2/src/s11n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2428/src/s11n Modified Files: Makefile.toc abstract_creator.h algo.h classload.h data_node.cpp data_node.h data_node_algo.h data_node_functor.h data_node_serialize.h functor.h list.h map.h pointer_stripper.h reg_list_specializations.h reg_map_specializations.h reg_serializable_traits.h s11n.cpp s11n.h s11n_debuggering_macros.h s11n_node.cpp s11n_node.h traits.h valarray.h Log Message: whew - moved namespace s11n ==> P::s11n. Index: s11n_node.cpp =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n_node.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- s11n_node.cpp 26 Dec 2004 00:37:07 -0000 1.1 +++ s11n_node.cpp 26 Dec 2004 00:55:20 -0000 1.2 @@ -6,7 +6,7 @@ #include "s11n_node.h" -namespace s11n { +namespace P { namespace s11n { #define NODE_CLASS_NAME "s11n::s11n_node" // note that the default implclass is not useable for purposes of classloading // serializables, but: @@ -159,6 +159,6 @@ return this->m_map.end(); } -} // namespace s11n +} } // namespace P::s11n #undef NODE_CLASS_NAME Index: data_node_serialize.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/data_node_serialize.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- data_node_serialize.h 26 Dec 2004 00:37:07 -0000 1.1 +++ data_node_serialize.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -30,6 +30,7 @@ #define NODEERR if(0) CERR // ^^^ a debugging macro +namespace P { namespace { // anon namespace important for linking reasons, to avoid ODR violations. /*** @@ -401,8 +402,8 @@ } -} // namespace s11n +}} // namespace P::s11n #undef NODEERR -#endif // s11n_DATA_SERIALIZE_H_INCLUDED +#endif // p_DATA_SERIALIZE_H_INCLUDED Index: s11n_node.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n_node.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- s11n_node.h 26 Dec 2004 00:37:07 -0000 1.1 +++ s11n_node.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -13,12 +13,10 @@ #include <vector> #include "str.h" // to/from() string -namespace s11n { +namespace P { namespace s11n { /** - EXPERIMENTAL: Not for use in client code! - - s11n_node is a reference Data Node implementation intended + s11n_node is a reference Data Node implementation intended for use with s11n::node_traits. */ class s11n_node @@ -300,6 +298,6 @@ }; // class s11n_node -} // namespace s11n +} } // namespace s11n #endif // s11n_S11N_NODE_HPP_INCLUDED Index: abstract_creator.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/abstract_creator.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- abstract_creator.h 26 Dec 2004 00:37:07 -0000 1.1 +++ abstract_creator.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -13,6 +13,7 @@ #include "classload.h" // classloader-related funcs #include "class_name.h" +namespace P { namespace s11n { @@ -145,7 +146,7 @@ ? implclass : ::classname<value_type>(); - v = ::s11n::cl::classload<base_value_type>( key ); + v = ::P::s11n::cl::classload<base_value_type>( key ); if( 0 ) CERR << "create(*) implclass=["<<key<<"] allocated @" <<std::hex<<&v <<"\n"; return 0 != &v; } @@ -162,7 +163,7 @@ }; // abstract_creator<T *> -} // namespace +} } // namespace P::s11n -#endif // s11n_ABSTRACT_CREATOR_H_INCLUDED +#endif // p_ABSTRACT_CREATOR_H_INCLUDED Index: reg_map_specializations.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/reg_map_specializations.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- reg_map_specializations.h 26 Dec 2004 00:37:07 -0000 1.1 +++ reg_map_specializations.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -9,7 +9,7 @@ #endif #ifndef S11N_MAP_TYPE_PROXY -#define S11N_MAP_TYPE_PROXY ::s11n::map::map_serializable_proxy +#define S11N_MAP_TYPE_PROXY ::P::s11n::map::map_serializable_proxy #endif namespace { // set up ::classname<>() @@ -27,7 +27,7 @@ static bool inited = false; if( (!inited) && (inited=true) ) { - ::s11n::cl::classloader_register_base< named_type >( S11N_MAP_TYPE_NAME ); + ::P::s11n::cl::classloader_register_base< named_type >( S11N_MAP_TYPE_NAME ); } return S11N_MAP_TYPE_NAME; } @@ -48,7 +48,7 @@ typedef S11N_MAP_TYPE<KeyT,ValT> serializable_type; typedef S11N_MAP_TYPE_PROXY serialize_functor; typedef serialize_functor deserialize_functor; - typedef ::s11n::cl::object_factory<serializable_type> factory_type; + typedef ::P::s11n::cl::object_factory<serializable_type> factory_type; static const bool cl_reg_placeholder = (::classname<serializable_type>(),true) ; }; Index: data_node.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/data_node.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- data_node.h 26 Dec 2004 00:37:07 -0000 1.1 +++ data_node.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -17,6 +17,7 @@ #include <pclasses/Util/LexT.h> #include "functor.h" // some helpful functors +namespace P { namespace s11n { /** @@ -544,11 +545,11 @@ }; // class data_node -} // namespace s11n +} } // namespace P::s11n #include "traits.h" -namespace s11n { +namespace P { namespace s11n { /** A node_traits specialization for @@ -680,6 +681,6 @@ }; // end node_traits<s11n::data_node> -} // namespace s11n +} } // namespace P::s11n -#endif // s11n_DATA_NODE_H_INCLUDED +#endif // p_DATA_NODE_H_INCLUDED Index: classload.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/classload.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- classload.h 26 Dec 2004 00:37:07 -0000 1.1 +++ classload.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -4,6 +4,7 @@ #include <pclasses/Factory.h> // default classloader/factory implementation. +namespace P { namespace s11n { /** @@ -164,7 +165,7 @@ } // namespace cl -} // namespace s11n +} } // namespace P::s11n #endif // s11n_cl_S11N_CLASSLOAD_HPP_INCLUDED Index: s11n_debuggering_macros.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n_debuggering_macros.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- s11n_debuggering_macros.h 26 Dec 2004 00:37:07 -0000 1.1 +++ s11n_debuggering_macros.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -5,17 +5,6 @@ // decorative. #ifndef CERR #define CERR std::cerr << __FILE__ << ":" << std::dec << __LINE__ << " : " -#define CERRL(A) CERR << A << std::endl; -#endif - -#ifndef COUT -#define COUT std::cout << __FILE__ << ":" << std::dec << __LINE__ << " : " -#define COUTL(A) COUT << A << std::endl; -#endif - -#ifndef DTOROUT -#define DTOR_DEBUG 0 -#define DTOROUT(CLASSNAME) if(DTOR_DEBUG) CERR << "~" << # CLASSNAME << "() " #endif #endif // s11n_DEBUGGERING_MACROS_H Index: valarray.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/valarray.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- valarray.h 26 Dec 2004 00:37:07 -0000 1.1 +++ valarray.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -22,7 +22,7 @@ static std::string n = "valarray"; if( !cl_reg_placeholder && (cl_reg_placeholder=true) ) { - ::s11n::cl::classloader_register< + ::P::s11n::cl::classloader_register< valarray_type,valarray_type >( n ); } @@ -33,7 +33,7 @@ bool class_name< std::valarray<VT> >::cl_reg_placeholder = (::classname< std::valarray<VT> >(),true); } // anonymous ns -namespace s11n { +namespace P { namespace s11n { /** s11n::va encapsulates de/serialization operators for @@ -132,13 +132,13 @@ struct s11n_traits < std::valarray<ValueType> > { typedef std::valarray<ValueType> serializable_type; - typedef ::s11n::va::valarray_serializable_proxy serialize_functor; + typedef ::P::s11n::va::valarray_serializable_proxy serialize_functor; typedef serialize_functor deserialize_functor; - typedef ::s11n::cl::object_factory<serializable_type> factory_type; + typedef ::P::s11n::cl::object_factory<serializable_type> factory_type; }; -} // namespace s11n +} } // namespace P::s11n Index: map.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/map.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- map.h 26 Dec 2004 00:37:07 -0000 1.1 +++ map.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -23,6 +23,7 @@ #include "class_name.h" +namespace P { namespace s11n { @@ -317,7 +318,7 @@ template <typename NodeType, typename PairType> bool deserialize_pair( const NodeType & src, PairType & dest ) { - typedef ::s11n::node_traits<NodeType> NTR; + typedef ::P::s11n::node_traits<NodeType> NTR; //CERR << "deserialize_pair: deserialize " << src.impl_class() << "\n"; typedef typename PairType::first_type FT; typedef typename PairType::second_type ST; @@ -374,7 +375,7 @@ { CERR << "deserialize_pair(): deserialize(node, second) failed. "; // "Node name=["<<NTR::name(*ch)<<"] class=["<<implclass<<"].\n"; - ::s11n::dump_node_debug( *ch, std::cerr ); + ::P::s11n::dump_node_debug( *ch, std::cerr ); AC1st::release( f ); AC2nd::release( s ); return false; @@ -603,11 +604,11 @@ -} // namespace s11n +} } // namespace P::s11n #define S11N_MAP_TYPE std::pair #define S11N_MAP_TYPE_NAME "pair" -#define S11N_MAP_TYPE_PROXY ::s11n::map::pair_serializable_proxy +#define S11N_MAP_TYPE_PROXY ::P::s11n::map::pair_serializable_proxy #include "reg_map_specializations.h" #define S11N_MAP_TYPE std::map Index: s11n.cpp =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- s11n.cpp 26 Dec 2004 00:37:07 -0000 1.1 +++ s11n.cpp 26 Dec 2004 00:55:20 -0000 1.2 @@ -2,6 +2,7 @@ #include "s11n.h" #include <pclasses/pclasses-config.h> +namespace P { namespace s11n { std::string library_version() @@ -9,4 +10,4 @@ return PCLASSES_PACKAGE_VERSION; } -} // namespace s11n +} } // namespace P::s11n Index: algo.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/algo.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- algo.h 26 Dec 2004 00:37:07 -0000 1.1 +++ algo.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -11,6 +11,7 @@ #include "functor.h" // object_deleter() +namespace P { namespace s11n { @@ -92,6 +93,6 @@ } -} +} } // P::s11n -#endif // s11n_ALGO_H_INCLUDED +#endif // p_ALGO_H_INCLUDED Index: pointer_stripper.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/pointer_stripper.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pointer_stripper.h 26 Dec 2004 00:37:07 -0000 1.1 +++ pointer_stripper.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -1,6 +1,7 @@ #ifndef p_POINTER_STRIPPER_H_INCLUDED #define p_POINTER_STRIPPER_H_INCLUDED 1 +namespace P { namespace s11n { /** Helper class to strip pointers from value_type @@ -45,6 +46,6 @@ typedef T value_type; }; -} +} } #endif // s11n_POINTER_STRIPPER_H_INCLUDED Index: traits.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/traits.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- traits.h 26 Dec 2004 00:37:07 -0000 1.1 +++ traits.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -7,6 +7,7 @@ #include "classload.h" // default classloader/factory implementation. +namespace P { namespace s11n { /** @@ -348,7 +349,7 @@ registered via the s11n::cl::classload() family of functions. */ - typedef ::s11n::cl::object_factory<serializable_type> factory_type; + typedef ::P::s11n::cl::object_factory<serializable_type> factory_type; /** Functor type implementing serialize code. @@ -358,7 +359,7 @@ bool operator()( SomeNodeType & dest, const base_type & src ) const; */ - typedef ::s11n::default_serialize_functor serialize_functor; + typedef ::P::s11n::default_serialize_functor serialize_functor; /** Functor type implementing deserialize code. @@ -367,7 +368,7 @@ bool operator()( const SomeNodeType & src, base_type & dest ) const; */ - typedef ::s11n::default_serialize_functor deserialize_functor; + typedef ::P::s11n::default_serialize_functor deserialize_functor; }; // end s11n_traits<> // namespace Private @@ -426,7 +427,7 @@ // }; -} // namespace s11n +} } // namespace P::s11n #endif // s11n_S11N_TRAITS_HPP_INCLUDED Index: reg_list_specializations.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/reg_list_specializations.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- reg_list_specializations.h 26 Dec 2004 00:37:07 -0000 1.1 +++ reg_list_specializations.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -9,7 +9,7 @@ #endif #ifndef S11N_LIST_TYPE_PROXY -#define S11N_LIST_TYPE_PROXY ::s11n::list::list_serializable_proxy +#define S11N_LIST_TYPE_PROXY ::P::s11n::list::list_serializable_proxy #endif // #ifndef S11N_LIST_REGISTRATION_FUNC_DEFINED @@ -21,7 +21,7 @@ // { // const char * cn = ::classname<T>(); // CERR << "register_list_type<>("<<cn<<")\n"; -// ::s11n::cl::classloader_register_base< T >( cn ); +// ::P::s11n::cl::classloader_register_base< T >( cn ); // } // } // } @@ -43,7 +43,7 @@ static bool inited = false; if( (!inited) && (inited=true) ) { - ::s11n::cl::classloader_register_base< named_type >( S11N_LIST_TYPE_NAME ); + ::P::s11n::cl::classloader_register_base< named_type >( S11N_LIST_TYPE_NAME ); } return S11N_LIST_TYPE_NAME; } @@ -52,6 +52,7 @@ } // anon namespace +namespace P { namespace s11n { @@ -64,11 +65,11 @@ typedef S11N_LIST_TYPE<ValT> serializable_type; typedef S11N_LIST_TYPE_PROXY serialize_functor; typedef serialize_functor deserialize_functor; - typedef ::s11n::cl::object_factory<serializable_type> factory_type; + typedef ::P::s11n::cl::object_factory<serializable_type> factory_type; static const bool cl_reg_placeholder = (::classname<serializable_type>(),true) ; }; -} // namespace s11n +} } // namespace P::s11n #undef S11N_LIST_TYPE_PROXY #undef S11N_LIST_TYPE_NAME Index: Makefile.toc =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/Makefile.toc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.toc 26 Dec 2004 00:37:07 -0000 1.1 +++ Makefile.toc 26 Dec 2004 00:55:20 -0000 1.2 @@ -19,7 +19,6 @@ pods_streamable.h \ reg_list_specializations.h \ reg_map_specializations.h \ - reg_node_type.h \ reg_serializable_traits.h \ s11n_debuggering_macros.h \ s11n_node.h \ Index: data_node_algo.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/data_node_algo.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- data_node_algo.h 26 Dec 2004 00:37:07 -0000 1.1 +++ data_node_algo.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -23,6 +23,7 @@ // NO DEPS ON data_node.h ALLOWED! //////////////////////////////////////////////////////////////////////// +namespace P { namespace s11n { @@ -139,6 +140,6 @@ } -} // namespace s11n +}} // namespace s11n -#endif // s11n_DATA_ALGO_H_INCLUDED +#endif // p_DATA_ALGO_H_INCLUDED Index: list.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/list.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- list.h 26 Dec 2004 00:37:07 -0000 1.1 +++ list.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -23,6 +23,7 @@ #include <pclasses/Util/LexT.h> +namespace P { namespace s11n { @@ -188,12 +189,12 @@ if( 0 ) { ERRPRE << "child node="<<std::hex<<nch<<std::dec<<", deserialized to ser. implclass="<<implclass<<". It's data node says:\n"; - ::s11n::dump_node_debug( *nch, std::cerr ); + ::P::s11n::dump_node_debug( *nch, std::cerr ); } } if( 0 ) { CERR << "deserialize_list(). INPUT Node tree looks something like:\n"; - ::s11n::dump_node_debug( src, std::cerr ); + ::P::s11n::dump_node_debug( src, std::cerr ); } ERRPRE <<"returning true. dest list size="<<dest.size()<<"...\n"; #undef ERRPRE @@ -416,7 +417,7 @@ } // namespace list -} // namespace s11n +}} // namespace P::s11n //////////////////////////////////////////////////////////////////////// // Register proxies for std-namespace sequence containers Index: data_node_functor.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/data_node_functor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- data_node_functor.h 26 Dec 2004 00:37:07 -0000 1.1 +++ data_node_functor.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -33,6 +33,7 @@ // NO DEPS ON data_node.h ALLOWED! //////////////////////////////////////////////////////////////////////// +namespace P { namespace s11n { /** @@ -315,7 +316,7 @@ -} // namespace s11n +} } // namespace s11n -#endif // s11n_DATA_NODE_FUNCTOR_H_INCLUDED +#endif // p_DATA_NODE_FUNCTOR_H_INCLUDED Index: data_node.cpp =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/data_node.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- data_node.cpp 26 Dec 2004 00:37:07 -0000 1.1 +++ data_node.cpp 26 Dec 2004 00:55:20 -0000 1.2 @@ -9,7 +9,7 @@ #include "data_node_functor.h" // functors to serialize data_nodes. -namespace s11n { +namespace P { namespace s11n { #define NODE_IMPL_CLASS "s11n::data_node" // note that the default implclass is not useable for purposes of classloading // serializables, but: @@ -280,4 +280,4 @@ -} // namespace s11n +} } // namespace P::s11n Index: s11n.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/s11n.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- s11n.h 26 Dec 2004 00:37:07 -0000 1.1 +++ s11n.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -13,6 +13,7 @@ #include <string> +namespace P { /** The s11n serialization (s11n) framework is an object serialization framework modelled heavily off work by Rusty Ballinger @@ -81,15 +82,12 @@ */ namespace io { } -} +} } // namespace P::s11n #include "classload.h" // #include "data_node.h" // reference Data Node implementation // #include "s11n_node.h" // Another reference Data Node implementation // #include "data_node_algo.h" // reference NodeType implementation // #include "data_node_serialize.h" // serialize() and friends -// #include "data_node_io.h" // i/o-related interfaces -// #include "data_node_format.h" // tree_builder and related classes -// #include "serializers.h" // default serializers/parsers. -#endif // s11n_S11N_H_INCLUDED +#endif // p_S11N_H_INCLUDED Index: functor.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/functor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- functor.h 26 Dec 2004 00:37:07 -0000 1.1 +++ functor.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -9,6 +9,7 @@ #include <string> #include "s11n_debuggering_macros.h" +namespace P { namespace s11n { @@ -368,6 +369,6 @@ }; -} // namespace s11n +} } // namespace P::s11n -#endif // s11n_FUNCTOR_H_INCLUDED +#endif // p_FUNCTOR_H_INCLUDED Index: reg_serializable_traits.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/reg_serializable_traits.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- reg_serializable_traits.h 26 Dec 2004 00:37:07 -0000 1.1 +++ reg_serializable_traits.h 26 Dec 2004 00:55:20 -0000 1.2 @@ -67,7 +67,7 @@ // as the Deserialization proxy, otherwise S11N_SERIALIZE_FUNCTOR // functor is used for both cases. // -// If neither are set then ::s11n::default_serialize_functor +// If neither are set then ::P::s11n::default_serialize_functor // is installed, and S11N_TYPE must conform to that proxy's // expectations. // @@ -98,7 +98,7 @@ # define S11N_BASE_TYPE S11N_TYPE # define S11N_INHERIT 0 # ifndef S11N_SERIALIZE_FUNCTOR -# define S11N_SERIALIZE_FUNCTOR ::s11n::default_serialize_functor +# define S11N_SERIALIZE_FUNCTOR ::P::s11n::default_serialize_functor # endif # ifndef S11N_DESERIALIZE_FUNCTOR # define S11N_DESERIALIZE_FUNCTOR S11N_SERIALIZE_FUNCTOR @@ -117,7 +117,7 @@ //////////////////////////////////////////////////////////////////////// // Set up s11n_traits<> specialization... -namespace s11n { +namespace P {namespace s11n { template <> struct s11n_traits < S11N_TYPE > @@ -143,7 +143,7 @@ // true); // #endif // S11N_REG_CLLITE -} // namespace s11n +} } // namespace P::s11n // end s11n_traits<> //////////////////////////////////////////////////////////////////////// |
