Update of /cvsroot/pclasses/pclasses2/src/s11n
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8647/src/s11n
Modified Files:
reg_serializable_traits.h
Log Message:
Tweaked the registration a bit.
Index: reg_serializable_traits.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/reg_serializable_traits.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reg_serializable_traits.h 26 Dec 2004 04:09:28 -0000 1.4
+++ reg_serializable_traits.h 26 Dec 2004 14:38:22 -0000 1.5
@@ -81,12 +81,7 @@
#endif
#ifndef PS11N_TYPE_NAME
-# ifdef PS11N_NAME // older convention
-# define PS11N_TYPE_NAME PS11N_NAME
-# undef PS11N_NAME
-# else
-# error "PS11N_TYPE_NAME must be set before including this file. Set it to the stringified form of PS11N_TYPE."
-# endif
+# error "PS11N_TYPE_NAME must be set before including this file. Set it to the stringified form of PS11N_TYPE."
#endif
@@ -114,17 +109,25 @@
# define PS11N_REG_CLLITE 0
#endif // PS11N_FACTORY_TYPE
+#include <pclasses/s11n/traits.h>
////////////////////////////////////////////////////////////////////////
// Set up s11n_traits<> specialization...
-namespace P {namespace s11n {
+namespace P { namespace s11n {
template <>
struct s11n_traits < PS11N_TYPE >
#if PS11N_INHERIT
- : public ::P::s11n::s11n_traits < PS11N_TYPE_INTERFACE >
+ : public s11n_traits < PS11N_TYPE_INTERFACE >
#endif
{
+// #if PS11N_INHERIT
+// typedef s11n_traits < PS11N_TYPE_INTERFACE > ParentType;
+// typedef PS11N_TYPE serializable_type;
+// typedef ParentType::serialize_functor serialize_functor;
+// typedef ParentType::deserialize_functor deserialize_functor;
+// typedef ParentType::factory_type factory_type;
+// #endif
#if ! PS11N_INHERIT
typedef PS11N_TYPE serializable_type;
typedef PS11N_SERIALIZE_FUNCTOR serialize_functor;
|
