[pclasses-cvs] pclasses2/src/s11n/proxy Time_s11n.h,1.2,1.3

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

Update of /cvsroot/pclasses/pclasses2/src/s11n/proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17094/src/s11n/proxy

Modified Files:
	Time_s11n.h 
Log Message:
Mass commit: lots of -l/-L linker changes/fixes.

Index: Time_s11n.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/s11n/proxy/Time_s11n.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Time_s11n.h	28 Dec 2004 21:58:25 -0000	1.2
+++ Time_s11n.h	29 Dec 2004 20:11:20 -0000	1.3
@@ -12,8 +12,6 @@
 #else
 
 
-#define CONCRETE_NODE_TYPE ::P::SIO::S11nNode
-
 ////////////////////////////////////////////////////////////////////////
 // Time proxy
 ////////////////////////////////////////////////////////////////////////
@@ -28,10 +26,10 @@
 	{
         
 		// serialize
-// 		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( CONCRETE_NODE_TYPE & dest, const Time & src ) const
+ 		template <typename NodeType>
+		bool operator()( NodeType & dest, const Time & src ) const
 		{
-			typedef ::P::s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef ::P::s11n::node_traits<NodeType> TR;
 			TR::class_name( dest, "P::Time" );
 			// don't use ::classname<Time>() here: it causes an ODR violation :(
 #  define SSET(K,F) TR::set( dest, std::string(K), src.F() );
@@ -44,10 +42,10 @@
 		}
 
 		// deserialize
-// 		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( const CONCRETE_NODE_TYPE & src, Time & dest ) const
+ 		template <typename NodeType>
+		bool operator()( const NodeType & src, Time & dest ) const
 		{
-			typedef s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef s11n::node_traits<NodeType> TR;
 #  define SGET(K,SF,GF) dest.SF( TR::get( src, std::string(K), dest.GF() ) );
 			SGET("sec", setSecond, second );
 			SGET("min", setMinute, minute );
@@ -80,10 +78,10 @@
 	{
         
 		// serialize
-//  		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( CONCRETE_NODE_TYPE & dest, const Date & src ) const
+  		template <typename NodeType>
+		bool operator()( NodeType & dest, const Date & src ) const
 		{
-			typedef ::P::s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef ::P::s11n::node_traits<NodeType> TR;
 			TR::class_name( dest, "P::Date" );
 #  define SSET(K,F) TR::set( dest, std::string(K), src.F() );
 			SSET("year", year );
@@ -94,10 +92,10 @@
 		}
 
 		// deserialize
-// 		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( const CONCRETE_NODE_TYPE & src, Date & dest ) const
+ 		template <typename NodeType>
+		bool operator()( const NodeType & src, Date & dest ) const
 		{
-			typedef s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef s11n::node_traits<NodeType> TR;
 #  define SGET(K,SF,GF) dest.SF( TR::get( src, std::string(K), dest.GF() ) );
 			SGET("year", setYear, year );
 			SGET("month", setMonth, month );
@@ -129,27 +127,27 @@
 	{
         
 		// serialize
-// 		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( CONCRETE_NODE_TYPE & dest, const DateTime & src ) const
+ 		template <typename NodeType>
+		bool operator()( NodeType & dest, const DateTime & src ) const
 		{
-			typedef ::P::s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef ::P::s11n::node_traits<NodeType> TR;
 			TR::class_name( dest, "P::DateTime" );
 			using namespace ::P::s11n;
-			bool worked = serialize_subnode<CONCRETE_NODE_TYPE,Time>( dest, "time", src );
-			worked = worked && serialize_subnode<CONCRETE_NODE_TYPE,Date>( dest, "date", src );
+			bool worked = serialize_subnode<NodeType,Time>( dest, "time", src );
+			worked = worked && serialize_subnode<NodeType,Date>( dest, "date", src );
 			return worked;
 		}
 
 		// deserialize
-// 		template <typename CONCRETE_NODE_TYPE>
-		bool operator()( const CONCRETE_NODE_TYPE & src, DateTime & dest ) const
+ 		template <typename NodeType>
+		bool operator()( const NodeType & src, DateTime & dest ) const
 		{
-			typedef s11n::node_traits<CONCRETE_NODE_TYPE> TR;
+			typedef s11n::node_traits<NodeType> TR;
 			using namespace ::P::s11n;
-			bool worked = deserialize_subnode<CONCRETE_NODE_TYPE,Time>( src, "time", dest );
+			bool worked = deserialize_subnode<NodeType,Time>( src, "time", dest );
 			if( worked )
 			{
-				worked = deserialize_subnode<CONCRETE_NODE_TYPE,Date>( src, "date", dest );
+				worked = deserialize_subnode<NodeType,Date>( src, "date", dest );
 			}
 			return worked;
 		}
@@ -162,7 +160,6 @@
 #  include <pclasses/s11n/reg_serializable_traits.h>
 #endif // p_DATETIME_REGISTERED_WITH_S11N
 
-#undef CONCRETE_NODE_TYPE
 
 #endif // PCLASSES_S11N_INCLUDED
 ////////////////////////////////////////////////////////////////////////