|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60886 - in sandbox/statistics/detail/assign: boost/assign/auto_size/check boost/assign/auto_size/range libs/assign/src
From: erwann.rogard_at_[hidden]
Date: 2010-03-28 09:35:10
Author: e_r
Date: 2010-03-28 09:35:09 EDT (Sun, 28 Mar 2010)
New Revision: 60886
URL: http://svn.boost.org/trac/boost/changeset/60886
Log:
m
Text files modified:
sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp | 8 +-
sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp | 109 ----------------------------------------
sandbox/statistics/detail/assign/libs/assign/src/main.cpp | 2
3 files changed, 5 insertions(+), 114 deletions(-)
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/check/all.hpp 2010-03-28 09:35:09 EDT (Sun, 28 Mar 2010)
@@ -66,10 +66,10 @@
BOOST_ASSIGN_AS_CHECK_adapter_lifo(std::stack<T>) \
BOOST_ASSIGN_AS_CHECK_fun_tpl(adapter_queue)() \
BOOST_ASSIGN_AS_CHECK_adapter_fifo(std::queue<T>) \
- BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_r)() \
- BOOST_ASSIGN_AS_CHECK_chain_r \
- BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_l)() \
- BOOST_ASSIGN_AS_CHECK_chain_l \
+ BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_r)() \
+ BOOST_ASSIGN_AS_CHECK_chain_r \
+ BOOST_ASSIGN_AS_CHECK_fun_tpl(chain_l)() \
+ BOOST_ASSIGN_AS_CHECK_chain_l \
BOOST_ASSIGN_AS_CHECK_fun_tpl(example2)() \
BOOST_ASSIGN_AS_CHECK_example2 \
} \
Modified: sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp
==============================================================================
--- sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp (original)
+++ sandbox/statistics/detail/assign/boost/assign/auto_size/range/converter.hpp 2010-03-28 09:35:09 EDT (Sun, 28 Mar 2010)
@@ -18,7 +18,6 @@
// Warning: some previous compiler workarounds were removed (for now).
-
#define BOOST_ASSIGN_AS_CONVERTER(R) \
template< class Container > \
operator Container() const \
@@ -161,112 +160,4 @@
}// assign
}// boost
-/*
-#define BOOST_ASSIGN_AS_CONVERTER \
- \
- public: \
- \
- template< class Container > \
- operator Container() const \
- { \
- return \
- this->convert_to_container<Container>(); \
- } \
- \
- template< class Container > \
- Container convert_to_container() const \
- { \
- static Container* c = 0; \
- BOOST_STATIC_CONSTANT( bool, is_array_flag = sizeof( assign_detail::assign_is_array( c ) ) \
- == sizeof( type_traits::yes_type ) ); \
- \
- typedef BOOST_DEDUCED_TYPENAME mpl::if_c< is_array_flag, \
- assign_detail::array_type_tag, \
- assign_detail::default_type_tag >::type tag_type;\
- \
- return this->convert<Container>( c, tag_type() ); \
- } \
- \
- protected: \
- \
- template< class Container > \
- Container convert( const Container*, assign_detail::default_type_tag ) const \
- { \
- \
- return Container( this->begin(), this->end() ); \
- } \
- \
- template< class Array > \
- Array convert( const Array*, assign_detail::array_type_tag ) const \
- { \
- typedef BOOST_DEDUCED_TYPENAME Array::value_type value_type; \
- \
- Array ar; \
- const std::size_t sz = ar.size(); \
- if( sz < boost::size( *this ) ) \
- throw assign::assignment_exception( "array initialized with too many elements" );\
- std::size_t n = 0; \
- BOOST_AUTO( i , this->begin() ); \
- BOOST_AUTO( e , this->end() ); \
- for( ; i != e; ++i, ++n ) \
- ar[n] = *i; \
- for( ; n < sz; ++n ) \
- ar[n] = value_type(); \
- return ar; \
- } \
- \
- template< class Adapter > \
- Adapter convert_to_adapter( const Adapter* = 0 ) const \
- { \
- Adapter a; \
- BOOST_AUTO( i , this->begin() ); \
- BOOST_AUTO( e , this->end() ); \
- for( ; i != e; ++i ) \
- a.push( *i ); \
- return a; \
- } \
- protected: \
- struct adapter_converter; \
- friend struct adapter_converter; \
- struct adapter_converter \
- { \
- const this_& gl; \
- adapter_converter( const this_& t ) : gl( t ) \
- {} \
- \
- adapter_converter( const adapter_converter& r ) \
- : gl( r.gl ) \
- { } \
- \
- template< class Adapter > \
- operator Adapter() const \
- { \
- return gl.convert_to_adapter<Adapter>(); \
- } \
- }; \
- public: \
- template< class Container > \
- Container to_container( Container& c ) const \
- { \
- return convert( &c, assign_detail::default_type_tag() ); \
- } \
- \
- adapter_converter to_adapter() const \
- { \
- return adapter_converter( *this ); \
- } \
- \
- template< class Adapter > \
- Adapter to_adapter( Adapter& a ) const \
- { \
- return this->convert_to_adapter( &a ); \
- } \
- \
- template< class Array > \
- Array to_array( Array& a ) const \
- { \
- return convert( &a, assign_detail::array_type_tag() ); \
- } \
-/**/
-
#endif
Modified: sandbox/statistics/detail/assign/libs/assign/src/main.cpp
==============================================================================
--- sandbox/statistics/detail/assign/libs/assign/src/main.cpp (original)
+++ sandbox/statistics/detail/assign/libs/assign/src/main.cpp 2010-03-28 09:35:09 EDT (Sun, 28 Mar 2010)
@@ -12,7 +12,7 @@
void (*fp)();
{
- fp = check_ref_list_of_adapter_stack<int>;
+ fp = check_ref_list_of_chain_r<int>;
(*fp)();
}
std::cout << "check_ref_list_of : ok" << std::endl;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk