From: stephan b. <sg...@us...> - 2004-12-26 09:14:23
|
Update of /cvsroot/pclasses/pclasses2/src/s11n In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16563/src/s11n Modified Files: map.h Log Message: traits-related fixes. Index: map.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/src/s11n/map.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- map.h 26 Dec 2004 07:53:19 -0000 1.4 +++ map.h 26 Dec 2004 09:14:12 -0000 1.5 @@ -60,6 +60,7 @@ template <typename NodeType, typename MapType> bool serialize_streamable_map( NodeType & dest, const MapType & src ) { + typedef ::P::s11n::node_traits<NodeType> TR; typedef typename MapType::value_type VT; typedef typename VT::first_type FT; typedef typename VT::second_type ST; @@ -68,7 +69,7 @@ using ::P::Util::LexT; for( ; src.end() != it; ++it ) { - dest.set( + TR::set( dest, LexT( (*it).first ).str(), LexT( (*it).second ).str() ); @@ -174,7 +175,7 @@ template <typename NodeType, typename PairType> bool serialize_streamable_pair( NodeType & dest, const PairType & src ) { - typedef s11n::node_traits<NodeType> TR; + typedef ::P::s11n::node_traits<NodeType> TR; TR::class_name( dest, ::classname<PairType>() ); typedef typename PairType::first_type FT; typedef typename PairType::second_type ST; @@ -225,7 +226,7 @@ template <typename NodeType, typename MapType> bool serialize_streamable_map_pairs( NodeType & dest, const MapType & src ) { - typedef s11n::node_traits<NodeType> TR; + typedef ::P::s11n::node_traits<NodeType> TR; TR::class_name( dest, ::classname<MapType>() ); typedef typename MapType::value_type VT; typedef typename VT::first_type FT; @@ -290,7 +291,7 @@ template <typename NodeType, typename PairType> bool serialize_pair( NodeType & dest, const PairType & src ) { - typedef s11n::node_traits<NodeType> NT; + typedef ::P::s11n::node_traits<NodeType> NT; NT::class_name( dest, ::classname<PairType>() ); NodeType * ch = & create_child( dest, "first" ); if( ! serialize( *ch, src.first ) ) |