From: stephan b. <sg...@us...> - 2004-12-26 01:44:04
|
Update of /cvsroot/pclasses/pclasses2/include/pclasses/Util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8801/include/pclasses/Util Modified Files: LexT.h Log Message: Changed s11n registration to use P::s11n. Index: LexT.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Util/LexT.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- LexT.h 25 Dec 2004 01:03:27 -0000 1.1 +++ LexT.h 26 Dec 2004 01:43:53 -0000 1.2 @@ -468,19 +468,19 @@ //////////////////////////////////////////////////////////////////////// -#ifdef s11n_S11N_INCLUDED // <--- that macro was added in s11n 0.9.7 +#ifdef PCLASSES_S11N_INCLUDED # ifndef p_UTIL_LEXT_REGISTERED_WITH_S11N # define p_UTIL_LEXT_REGISTERED_WITH_S11N 1 // We have s11n! Let's use it! // Plug in a proxy for LexT, to make it work like a Streamable... -# include <s11n.net/s11n/data_node_functor.hpp> // <-- s11n::streamable_type_serialization_proxy class -# include <s11n.net/s11n/pods_streamable.hpp> // <-- required for s11n 0.9.14+ -# define S11N_TYPE lext::LexT // <-- type of object to be treated as a Serializable -# define S11N_TYPE_NAME "LexT" // <-- class name (for the classloader) -# define S11N_SERIALIZE_FUNCTOR ::s11n::streamable_type_serialization_proxy -// ^^^^ our de/s11n implementation (proxy functor) -# include <s11n.net/s11n/reg_serializable_traits.hpp> // <-- register the above data with s11n +# include <pclasses/s11n/data_node_functor.h> // <-- s11n::streamable_type_serialization_proxy class +# include <pclasses/s11n/pods_streamable.h> // <-- required for s11n 0.9.14+ +# define PS11N_TYPE ::P::Util::LexT // <-- type of object to be treated as a Serializable +# define PS11N_TYPE_NAME "LexT" // <-- class name (for the classloader) +# define PS11N_SERIALIZE_FUNCTOR ::P::s11n::streamable_type_serialization_proxy + // ^^^^ our de/s11n implementation (proxy functor) +# include <pclasses/s11n/reg_serializable_traits.h> // <-- register the above data with s11n # endif // p_UTIL_LEXT_REGISTERED_WITH_S11N -#endif // s11n_S11N_INCLUDED +#endif // PCLASSES_S11N_INCLUDED //////////////////////////////////////////////////////////////////////// |