Subject: [Boost-commit] svn:boost r57931 - in sandbox/statistics/detail/fusion: boost/statistics/detail/fusion/serialization libs/statistics/detail/fusion/example libs/statistics/detail/fusion/src
From: erwann.rogard_at_[hidden]
Date: 2009-11-25 19:04:31
Author: e_r
Date: 2009-11-25 19:04:30 EST (Wed, 25 Nov 2009)
New Revision: 57931
URL: http://svn.boost.org/trac/boost/changeset/57931
Log:
m
Text files modified:
sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/serialization/map.hpp | 15 +++++++++++----
sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/serialize.cpp | 18 ++++--------------
sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp | 4 +++-
3 files changed, 18 insertions(+), 19 deletions(-)
Modified: sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/serialization/map.hpp
==============================================================================
--- sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/serialization/map.hpp (original)
+++ sandbox/statistics/detail/fusion/boost/statistics/detail/fusion/serialization/map.hpp 2009-11-25 19:04:30 EST (Wed, 25 Nov 2009)
@@ -24,11 +24,11 @@
template<class Archive,typename K1,typename D1>
void serialize(
Archive & ar,
- typename boost::fusion::result_of::make_map<K1,D1>::type& t,
+ boost::fusion::map<boost::fusion::pair<K1,D1> >& t,
const unsigned int file_version
)
{
- split_free(ar, t, file_version);
+ split_free(ar, t, file_version);
}
// n = 2
@@ -36,7 +36,10 @@
template<class Archive,typename K1,typename K2,typename D1,typename D2>
void serialize(
Archive & ar,
- typename boost::fusion::result_of::make_map<K1,K2,D1,D2>::type& t,
+ boost::fusion::map<
+ boost::fusion::pair<K1,D1>,
+ boost::fusion::pair<K2,D2>
+ >& t,
const unsigned int file_version
)
{
@@ -51,7 +54,11 @@
>
void serialize(
Archive & ar,
- typename boost::fusion::result_of::make_map<K1,K2,K3,D1,D2,D3>::type& t,
+ boost::fusion::map<
+ boost::fusion::pair<K1,D1>,
+ boost::fusion::pair<K2,D2>,
+ boost::fusion::pair<K3,D3>
+ >& t,
const unsigned int file_version
)
{
Modified: sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/serialize.cpp
==============================================================================
--- sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/serialize.cpp (original)
+++ sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/example/serialize.cpp 2009-11-25 19:04:30 EST (Wed, 25 Nov 2009)
@@ -23,11 +23,7 @@
#include <boost/fusion/include/make_vector.hpp>
#include <boost/statistics/detail/fusion/serialization/include.hpp>
-//#include <boost/statistics/detail/fusion/serialization/save.hpp>
-//#include <boost/statistics/detail/fusion/serialization/load.hpp>
-//#include <boost/statistics/detail/fusion/serialization/map.hpp>
-//#include <boost/statistics/detail/fusion/serialization/vector.hpp>
-
+#include <boost/statistics/detail/fusion/serialization/map.hpp> // tmp
#include <libs/statistics/detail/fusion/example/serialize.h>
void example_serialize(std::ostream& os){
@@ -79,19 +75,13 @@
ia_ ia(ifs);
ia >> vec;
BOOST_ASSERT(
- boost::fusion::at_key<k0_>(
- boost::fusion::at_c<0>(vec)
- )== d0
+ boost::fusion::at_key<k0_>( boost::fusion::at_c<0>(vec) ) == d0
);
BOOST_ASSERT(
- boost::fusion::at_key<k1_>(
- boost::fusion::at_c<0>(vec)
- )== d1
+ boost::fusion::at_key<k1_>( boost::fusion::at_c<0>(vec) ) == d1
);
BOOST_ASSERT(
- boost::fusion::at_key<k2_>(
- boost::fusion::at_c<1>(vec)
- )== d2
+ boost::fusion::at_key<k2_>( boost::fusion::at_c<1>(vec) ) == d2
);
}
Modified: sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp
==============================================================================
--- sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp (original)
+++ sandbox/statistics/detail/fusion/libs/statistics/detail/fusion/src/main.cpp 2009-11-25 19:04:30 EST (Wed, 25 Nov 2009)
@@ -8,11 +8,13 @@
#include <iostream>
#include <libs/statistics/detail/fusion/example/at_key.h>
#include <libs/statistics/detail/fusion/example/serialize.h>
+#include <libs/statistics/detail/fusion/example/joint_view_binder.h>
int main(){
- example_at_key_iterator(std::cout);
+ // example_at_key_iterator(std::cout);
example_serialize(std::cout);
+ // example_joint_view_binder(std::cout);
return 0;
}