Subject: [Boost-commit] svn:boost r70453 - in sandbox/assign_v2: boost/assign/v2 boost/assign/v2/deque boost/assign/v2/include boost/assign/v2/interpreter boost/assign/v2/option boost/assign/v2/put boost/assign/v2/ref/array boost/assign/v2/utility/chain boost/assign/v2/utility/conversion libs/assign/v2/test libs/assign/v2/test/option libs/assign/v2/test/put/pipe libs/assign/v2/test/put/pipe/option libs/assign/v2/test/unit_testing libs/assign/v2/test/utility
From: erwann.rogard_at_[hidden]
Date: 2011-03-22 21:09:56
Author: e_r
Date: 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
New Revision: 70453
URL: http://svn.boost.org/trac/boost/changeset/70453
Log:
upd assign_v2
Added:
sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp
- copied, changed from r70414, /sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp
Removed:
sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp
Text files modified:
sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp | 2
sandbox/assign_v2/boost/assign/v2/deque/deque.hpp | 8 +--
sandbox/assign_v2/boost/assign/v2/include.hpp | 18 ++++++++--
sandbox/assign_v2/boost/assign/v2/include/_chain.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_convert.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_csv_put.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_data.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_insert.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_key.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_push.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/include/ref.hpp | 2
sandbox/assign_v2/boost/assign/v2/interpreter.hpp | 2
sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp | 8 ++--
sandbox/assign_v2/boost/assign/v2/option/data.hpp | 4 +-
sandbox/assign_v2/boost/assign/v2/option/modifier.hpp | 2
sandbox/assign_v2/boost/assign/v2/put/put.hpp | 10 ++--
sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp | 6 +-
sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp | 12 +++---
sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp | 43 ++++++++----------------
sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp | 2
sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp | 2
sandbox/assign_v2/libs/assign/v2/test/deque.cpp | 70 ++++++++++++++++++++++++++-------------
sandbox/assign_v2/libs/assign/v2/test/option.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/option/data.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/option/data.h | 4 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp | 2
sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.h | 4 +-
sandbox/assign_v2/libs/assign/v2/test/unit_testing/framework.cpp | 4 +-
sandbox/assign_v2/libs/assign/v2/test/unit_testing/optional.cpp | 16 ++++----
sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp | 20 +++++-----
sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp | 10 ++--
37 files changed, 175 insertions(+), 158 deletions(-)
Modified: sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/csv_deque.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -37,7 +37,7 @@
}// result_of
}// aux
-//[syntax_put_deque_csv_deque
+//[syntax_deque_csv_deque
template<typename T>
struct csv_deque_value/*<-*/
Modified: sandbox/assign_v2/boost/assign/v2/deque/deque.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/deque/deque.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/deque/deque.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/interpreter/crtp.hpp>
#include <boost/assign/v2/interpreter/data.hpp>
#include <boost/assign/v2/interpreter/modifier.hpp>
-#include <boost/assign/v2/interpreter/replace_parameter.hpp>
+#include <boost/assign/v2/interpreter/replace.hpp>
#include <boost/assign/v2/deque/fwd.hpp>
#include <boost/assign/v2/detail/config/enable_cpp0x.hpp>
#include <boost/assign/v2/detail/keyword/nil.hpp>
@@ -31,7 +31,7 @@
namespace boost{
namespace assign{
namespace v2{
-//[syntax_put_deque_deque
+//[syntax_deque_deque
namespace aux{
template<typename T>
@@ -39,12 +39,10 @@
template<typename T, typename F, typename Tag>
class deque_interpreter
-//<-
: public interpreter_crtp<
typename deque_impl<T>::type, F, Tag,
deque_interpreter<T, F, Tag>
>
-//->
{
//<-
typedef typename deque_impl<T>::type impl_;
@@ -132,7 +130,7 @@
};
template<typename T, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_fun< deque_interpreter<T, F, Tag> >/*<-*/
+ struct /*<<Metafunction class>>*/replace_data_generator< deque_interpreter<T, F, Tag> >/*<-*/
{
template<typename F1>
struct apply{ typedef deque_interpreter<T, F1, Tag> type; };
Modified: sandbox/assign_v2/boost/assign/v2/include.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -9,13 +9,23 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_ER_2010_HPP
-#include <boost/assign/v2/include/chain.hpp>
-#include <boost/assign/v2/include/convert.hpp>
+#include <boost/assign/v2/include/_chain.hpp>
+#include <boost/assign/v2/include/_convert.hpp>
+#include <boost/assign/v2/include/_csv_put.hpp>
+#include <boost/assign/v2/include/_data.hpp>
+#include <boost/assign/v2/include/_insert.hpp>
+#include <boost/assign/v2/include/_iterate.hpp>
+#include <boost/assign/v2/include/_key.hpp>
+#include <boost/assign/v2/include/_mapped.hpp>
+#include <boost/assign/v2/include/_push.hpp>
+#include <boost/assign/v2/include/_push_back.hpp>
+#include <boost/assign/v2/include/_push_front.hpp>
+#include <boost/assign/v2/include/_repeat.hpp>
#include <boost/assign/v2/include/converter.hpp>
#include <boost/assign/v2/include/csv.hpp>
#include <boost/assign/v2/include/csv_deque.hpp>
#include <boost/assign/v2/include/deque.hpp>
-#include <boost/assign/v2/include/operator.hpp>
-#include <boost/assign/v2/include/ref.hpp>
+//#include <boost/assign/v2/include/ref.hpp>
+//#include <boost/assign/v2/include/logical_and.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_chain.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_chain.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_chain.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CHAIN_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CHAIN_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__CHAIN_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__CHAIN_ER_2010_HPP
#include <boost/assign/v2/utility/chain/chain.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CHAIN_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__CHAIN_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_convert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_convert.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CONVERT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CONVERT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__CONVERT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__CONVERT_ER_2010_HPP
#include <boost/assign/v2/utility/conversion/convert.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CONVERT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__CONVERT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_csv_put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_csv_put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_csv_put.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CSV_PUT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CSV_PUT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__CSV_PUT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__CSV_PUT_ER_2010_HPP
#include <boost/assign/v2/put/pipe/csv_put.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_CSV_PUT_ER_2010_HPP
\ No newline at end of file
+#endif // BOOST_ASSIGN_V2_INCLUDE__CSV_PUT_ER_2010_HPP
\ No newline at end of file
Modified: sandbox/assign_v2/boost/assign/v2/include/_data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_data.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_DATA_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_DATA_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP
#include <boost/assign/v2/option/data.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_DATA_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__DATA_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_insert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_insert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_insert.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_INSERT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_INSERT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP
#include <boost/assign/v2/option/insert.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_INSERT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__INSERT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_iterate.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_ITERATE_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_ITERATE_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP
#include <boost/assign/v2/option/iterate.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_ITERATE_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__ITERATE_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_key.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_key.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_key.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_KEY_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_KEY_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP
#include <boost/assign/v2/option/key.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_KEY_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__KEY_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_mapped.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_MAPPED_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_MAPPED_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP
#include <boost/assign/v2/option/mapped.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_MAPPED_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__MAPPED_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_push.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP
#include <boost/assign/v2/option/push.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push_back.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_BACK_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_BACK_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP
#include <boost/assign/v2/option/push_back.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_BACK_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_BACK_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_push_front.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_FRONT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_FRONT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP
#include <boost/assign/v2/option/push_front.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_PUSH_FRONT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__PUSH_FRONT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/_repeat.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INCLUDE_KEYWORD_REPEAT_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INCLUDE_KEYWORD_REPEAT_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP
#include <boost/assign/v2/option/repeat.hpp>
-#endif // BOOST_ASSIGN_V2_INCLUDE_KEYWORD_REPEAT_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INCLUDE__REPEAT_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/include/ref.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/include/ref.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/include/ref.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -9,6 +9,6 @@
//////////////////////////////////////////////////////////////////////////////
#ifndef BOOST_ASSIGN_V2_INCLUDE_REF_ER_2010_HPP
#define BOOST_ASSIGN_V2_INCLUDE_REF_ER_2010_HPP
-#include <boost/assign/v2/ref/include.hpp>
+//#include <boost/assign/v2/ref/include.hpp>
#endif // BOOST_ASSIGN_V2_INCLUDE_REF_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/interpreter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -11,6 +11,6 @@
#define BOOST_ASSIGN_V2_INTERPRETER_ER_2010_HPP
#include <boost/assign/v2/interpreter/crtp.hpp>
#include <boost/assign/v2/interpreter/modifier.hpp>
-#include <boost/assign/v2/interpreter/replace_parameter.hpp>
+#include <boost/assign/v2/interpreter/replace.hpp>
#endif // BOOST_ASSIGN_V2_INTERPRETER_ER_2010_HPP
Copied: sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp (from r70414, /sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp)
==============================================================================
--- /sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/interpreter/replace.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -7,8 +7,8 @@
// Boost Software License, Version 1.0. (See accompanying file //
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
+#ifndef BOOST_ASSIGN_V2_INTERPRETER_REPLACE_ER_2010_HPP
+#define BOOST_ASSIGN_V2_INTERPRETER_REPLACE_ER_2010_HPP
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/mpl/apply.hpp>
@@ -19,7 +19,7 @@
namespace aux{
template<typename /*<<Inherits interpreter_crtp\<\> >>*/D>
- struct /*<<Metafunction class to be specialized on D>>*/replace_fun{
+ struct /*<<Metafunction class to be specialized on D>>*/replace_data_generator{
template<typename F>
struct /*<<Transforms D by replacing D::fun_type with F>>*/apply{};
};
@@ -36,4 +36,4 @@
}// assign
}// boost
-#endif // BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
+#endif // BOOST_ASSIGN_V2_INTERPRETER_REPLACE_ER_2010_HPP
Deleted: sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/interpreter/replace_parameter.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
+++ (empty file)
@@ -1,39 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Boost.Assign v2 //
-// //
-// Copyright (C) 2003-2004 Thorsten Ottosen //
-// Copyright (C) 2010 Erwann Rogard //
-// Use, modification and distribution are subject to the //
-// Boost Software License, Version 1.0. (See accompanying file //
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //
-//////////////////////////////////////////////////////////////////////////////
-#ifndef BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
-#define BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
-#include <boost/assign/v2/detail/pp/ignore.hpp>
-#include <boost/mpl/apply.hpp>
-
-namespace boost{
-namespace assign{
-namespace v2{
-//[syntax_put_adapter_replace_parameter
-namespace aux{
-
- template<typename /*<<Inherits interpreter_crtp\<\> >>*/D>
- struct /*<<Metafunction class to be specialized on D>>*/replace_fun{
- template<typename F>
- struct /*<<Transforms D by replacing D::fun_type with F>>*/apply{};
- };
-
- template<typename /*<<Inherits interpreter_crtp\<\> >>*/ D>
- struct /*<<Metafunction class to be specialized on D>>*/ replace_modifier_tag{
- template<typename Tag>
- struct /*<<Transforms D by replacing Tag D::modifier_tag with Tag>>*/ apply{};
- };
-
-}// aux
-//]
-}// v2
-}// assign
-}// boost
-
-#endif // BOOST_ASSIGN_V2_INTERPRETER_REPLACE_PARAMETER_ER_2010_HPP
Modified: sandbox/assign_v2/boost/assign/v2/option/data.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/data.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/data.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/detail/keyword/ignore.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
-#include <boost/assign/v2/interpreter/replace_parameter.hpp>
+#include <boost/assign/v2/interpreter/replace.hpp>
#include <boost/mpl/apply.hpp>
namespace boost{
@@ -25,7 +25,7 @@
template<typename D>
struct /*<<Metafunction class>>*/option_data_generator/*<-*/{
- typedef aux::replace_fun<D> meta_;
+ typedef aux::replace_data_generator<D> meta_;
template<typename F>
struct apply : ::boost::mpl::apply1<meta_, F>{};
Modified: sandbox/assign_v2/boost/assign/v2/option/modifier.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/option/modifier.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/option/modifier.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/interpreter/fwd.hpp>
#include <boost/assign/v2/interpreter/modifier.hpp>
-#include <boost/assign/v2/interpreter/replace_parameter.hpp>
+#include <boost/assign/v2/interpreter/replace.hpp>
#include <boost/mpl/apply.hpp>
#include <boost/preprocessor/cat.hpp>
Modified: sandbox/assign_v2/boost/assign/v2/put/put.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/put/put.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/put/put.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -12,7 +12,7 @@
#include <boost/assign/v2/interpreter/crtp.hpp>
#include <boost/assign/v2/interpreter/data.hpp>
#include <boost/assign/v2/interpreter/modifier.hpp>
-#include <boost/assign/v2/interpreter/replace_parameter.hpp>
+#include <boost/assign/v2/interpreter/replace.hpp>
#include <boost/assign/v2/detail/pp/ignore.hpp>
#include <boost/assign/v2/ref/wrapper/copy.hpp>
@@ -24,9 +24,9 @@
template<typename C, typename F, typename Tag>
class put_interpreter
+ : protected ref::wrapper< ref::assign_tag::copy, C >,
//<-
- : protected ref::wrapper< ref::assign_tag::copy, C >
- , public aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
+ public aux::interpreter_crtp< C, F, Tag, put_interpreter<C, F, Tag> >
//->
{
//<-
@@ -62,7 +62,7 @@
};
template<typename C, typename F, typename Tag>
- struct /*<<Metafunction class>>*/replace_fun< aux::put_interpreter<C, F, Tag> >{/*<-*/
+ struct /*<<Metafunction class>>*/replace_data_generator< aux::put_interpreter<C, F, Tag> >{/*<-*/
template<typename F1>
struct apply{ typedef aux::put_interpreter<C, F1, Tag> type; };
/*->*/};
@@ -77,7 +77,7 @@
namespace result_of{
template<typename C>
- struct /*<<Metafunction>>*/put{/*<-*/
+ struct /*<<Metafunction>>*/put/*<-*/{
typedef typename aux::deduce_data_generator<C>::type f_;
typedef typename aux::deduce_modifier_tag<C>::type modifier_tag_;
typedef aux::put_interpreter<C, f_, modifier_tag_> type;
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/array.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -60,21 +60,21 @@
template<typename T>
typename result_of::array<T, keyword_aux::nil>::type
- array( keyword_aux::nil )/*<-*/
+ /*<<Generates an empty array>>*/array( keyword_aux::nil )/*<-*/
{
return ref::list<list_aux::array_tag>( v2::_nil );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename T>
typename result_of::array<T>::type
- array(T& t)/*<-*/
+ /*<<Generates a size one array>>*/array(T& t)/*<-*/
{
return array<T>( v2::_nil )( t );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename T>
typename result_of::array<T const>::type
- array(T const & t)/*<-*/
+ /*<<Generates a size one array>>*/array(T const & t)/*<-*/
{
return array<T const>( v2::_nil )( t );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/csv_array.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -101,12 +101,12 @@
};
//->
- template<typename T, typename...Args>/*<-*/
- typename boost::lazy_disable_if<
+ template<typename T, typename...Args>
+ /*<-*/typename boost::lazy_disable_if<
v2::type_traits::or_const<T, Args...>,
result_of::csv_array<T, Args...>
- >::type
- /*<<Enabled only if each of `t, args...` bind to non-const lvalue>>*/csv_array( T& t, Args&...args )/*<-*/
+ >::type BOOST_ASSIGN_V2_IGNORE(/*->*/unspecified/*<-*/)/*->*/
+ csv_array( T& t, Args&...args )/*<-*/
{
return csv_helper<T, Args...>::call( t, args... );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
@@ -126,10 +126,10 @@
namespace result_of{
template<typename U, typename... Args>
- struct csv_array : nth_result_of::csv_array<
+ struct csv_array/*<-*/ : nth_result_of::csv_array<
1 + sizeof...(Args), U
>
- {};
+ {}/*->*/;
}// result_of
#endif
Modified: sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/ref/array/get.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -28,13 +28,12 @@
namespace boost{
namespace assign{
namespace v2{
-//[syntax_ref_wrapper_range_get
+//[syntax_ref_array_get
namespace ref{
-namespace range_aux{
namespace result_of{
template<typename /*<<Range of reference-wrappers>>*/R>
- struct /*<<Metafunction>>*/range_get/*<-*/{
+ struct /*<<Metafunction>>*/transform_get/*<-*/{
typedef ref::get_functor f_;
#ifdef BOOST_MSVC
@@ -51,11 +50,11 @@
}// result_of
template<typename R>
- typename range_aux::result_of::range_get<R>::type
+ typename result_of::transform_get<R>::type
/*<<Semantics: transforms `r` by invoking member function `get()`>>*/
- range_get(R& rw)/*<-*/
+ transform_get(R& rw)/*<-*/
{
- typedef typename range_aux::result_of::range_get<R>::type result_;
+ typedef typename result_of::transform_get<R>::type result_;
#ifdef BOOST_MSVC
return result_(
boost::make_transform_iterator( boost::begin( rw ), get_functor() ),
@@ -67,11 +66,11 @@
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename R>
- typename range_aux::result_of::range_get<R const>::type
+ typename result_of::transform_get<R const>::type
/*<<Semantics: transforms `r` by invoking member function `get()`>>*/
- range_get(R const& rw )/*<-*/
+ transform_get(R const& rw )/*<-*/
{
- typedef typename range_aux::result_of::range_get<R const>::type result_;
+ typedef typename result_of::transform_get<R const>::type result_;
#ifdef BOOST_MSVC
return result_(
boost::make_transform_iterator( boost::begin( rw ), get_functor() ),
@@ -85,37 +84,23 @@
struct get_adaptor/*<-*/{}/*->*/;
template<typename R>
- typename range_aux::result_of::range_get<R>::type
+ typename result_of::transform_get<R>::type
operator|(R& rw, get_adaptor)/*<-*/{
- return range_get( rw );
+ return transform_get( rw );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
template<typename R>
- typename range_aux::result_of::range_get<R const>::type
+ typename result_of::transform_get<R const>::type
operator|(R const& rw, get_adaptor)/*<-*/{
- return range_get( rw );
+ return transform_get( rw );
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
-}// range_aux
-namespace result_of{
-
- template<typename R>
- struct range_get/*<-*/ : boost::lazy_enable_if<
- boost::is_reference_wrapper<
- typename boost::range_value<
- typename boost::remove_cv<R>::type
- >::type
- >,
- range_aux::result_of::range_get<R>
- >{}/*->*/;
-
-}// result_of
//<-
namespace{
//->
- range_aux::get_adaptor const _get/*<-*/
- = range_aux::get_adaptor()/*->*/;
+ get_adaptor const _get/*<-*/
+ = get_adaptor()/*->*/;
//<-
}
Modified: sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/chain/check.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -63,7 +63,7 @@
typedef std::vector<w_> vec_w_;
typedef typename add_const_if<qual_v2, vec_w_ >::type vec2_;
// Transformation through range_get (necessary)
- typedef typename ref::result_of::range_get<vec2_>::type r2_;
+ typedef typename ref::result_of::transform_get<vec2_>::type r2_;
{
typedef r1_ cr1_;
Modified: sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp
==============================================================================
--- sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp (original)
+++ sandbox/assign_v2/boost/assign/v2/utility/conversion/convert.hpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -68,7 +68,7 @@
}//result_of
template<typename C>
-conversion_aux::convert_adapter<C> convert()/*<-*/
+conversion_aux::convert_adapter<C> _convert()/*<-*/
{
return conversion_aux::convert_adapter<C>();
}BOOST_ASSIGN_V2_IGNORE(/*->*/;/*<-*/)/*->*/
Modified: sandbox/assign_v2/libs/assign/v2/test/deque.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/deque.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/deque.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -27,11 +27,42 @@
using namespace boost;
namespace as2 = assign::v2;
{
+ //[test_deque_ints
+ typedef as2::result_of::deque<int>::type C;
+
+ C empty_cont = as2::deque<int>( as2::_nil );
+ C cont1 = empty_cont( 72 )( 31 )( 48 );
+ C cont2 = as2::deque<int>( 72 )( 31 )( 48 );
+
+ std::deque<int> benchmark;
+ benchmark.push_back( 72 );
+ benchmark.push_back( 31 );
+ benchmark.push_back( 48 );
+
+ BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont1 ) );
+ BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont2 ) );
+ //]
+ }
+ {
+ //[test_deque_str_literal
+ typedef as2::result_of::deque<char*>::type C;
+
+ C deque = as2::deque<char*>( "x" )( "y" )( "z" );
+
+ std::deque<std::string> benchmark;
+ benchmark.push_back( "x" );
+ benchmark.push_back( "y" );
+ benchmark.push_back( "z" );
+
+ BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, deque ) );
+ //]
+ }
+ {
//[test_deque_pair
typedef std::string str_;
typedef std::pair<str_, str_> T;
typedef as2::result_of::deque<T>::type C;
- C airports = as2::deque<T>("AUH", "Abu Dhabi")("JFK", "New York")("LHR", "Heathrow")( "PEK", "Beijing" );
+ C airports = as2::deque<T>("AUH", "Abu Dhabi")("JFK", "New York")("LHR", "London")( "PEK", "Beijing" );
std::deque<T> benchmark;
benchmark.push_back( T("AUH", "Abu Dhabi") );
@@ -41,18 +72,15 @@
range::equal( benchmark, airports );
//]
- } {
- //[test_deque_ints
- typedef as2::result_of::deque<int>::type C1;
- typedef as2::result_of::csv_deque<int>::type C2;
+ }
+ {
+ //[test_csv_deque_ints
+ typedef as2::result_of::csv_deque<int>::type C;
- BOOST_MPL_ASSERT(( is_same<C1, C2> ));
+ BOOST_MPL_ASSERT(( is_same<C, as2::result_of::deque<int>::type> ));
- C1 empty_cont = as2::deque<int>( as2::_nil );
- C1 cont1 = empty_cont( 72 )( 31 )( 48 );
- C1 cont2 = as2::deque<int>( 72 )( 31 )( 48 );
- C1 cont3 = as2::csv_deque( 72, 31, 48 );
- C1 cont4 = as2::csv_deque( 72, 31 )( 48 );
+ C cont1 = as2::csv_deque( 72, 31, 48 );
+ C cont2 = as2::csv_deque( 72, 31 )( 48 );
std::deque<int> benchmark;
benchmark.push_back( 72 );
@@ -61,26 +89,22 @@
BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont1 ) );
BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont2 ) );
- BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont3 ) );
- BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, cont4 ) );
//]
}
{
- //[test_deque_str_literal
- typedef as2::result_of::deque<char*>::type C1;
- typedef as2::result_of::csv_deque<const char[2]>::type C2;
+ //[test_csv_deque_str_literal
+ typedef as2::result_of::csv_deque<const char[2]>::type C;
- BOOST_MPL_ASSERT(( is_same<C1, C2> ));
+ BOOST_MPL_ASSERT(( is_same<C, as2::result_of::deque<char*>::type> ));
- C1 deque1 = as2::deque<char*>( "x" )( "y" )( "z" );
- C2 deque2 = as2::csv_deque( "x", "y", "z" );
+ C deque = as2::csv_deque( "x", "y", "z" );
std::deque<std::string> benchmark;
- benchmark.push_back( "x" ); benchmark.push_back( "y" ); benchmark.push_back( "z" );
-
- BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, deque1 ) );
- BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, deque2 ) );
+ benchmark.push_back( "x" );
+ benchmark.push_back( "y" );
+ benchmark.push_back( "z" );
+ BOOST_ASSIGN_V2_CHECK( range::equal( benchmark, deque ) );
//]
}
}
Modified: sandbox/assign_v2/libs/assign/v2/test/option.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -18,7 +18,7 @@
namespace xxx_option{
void test(){
- xxx_fun::test();
+ xxx_data::test();
xxx_iterate::test();
xxx_mapped::test();
xxx_repeat::test();
Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -28,7 +28,7 @@
namespace test_assign_v2{
namespace xxx_option{
-namespace xxx_fun{
+namespace xxx_data{
void test()
{
@@ -67,6 +67,6 @@
}
-}// xxx_fun
+}// xxx_data
}// xxx_option
}// test_assign_v2
Modified: sandbox/assign_v2/libs/assign/v2/test/option/data.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/option/data.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/option/data.h 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -12,11 +12,11 @@
namespace test_assign_v2{
namespace xxx_option{
-namespace xxx_fun{
+namespace xxx_data{
void test();
-}// xxx_fun
+}// xxx_data
}// xxx_option
}// xxx_test_assign
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/option.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -21,7 +21,7 @@
void test()
{
- xxx_fun::test();
+ xxx_data::test();
xxx_iterate::test();
xxx_mapped::test();
xxx_repeat::test();
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -23,7 +23,7 @@
namespace xxx_put{
namespace xxx_pipe{
namespace xxx_option{
-namespace xxx_fun{
+namespace xxx_data{
void test()
{
@@ -46,7 +46,7 @@
}
}
-}// xxx_fun
+}// xxx_data
}// xxx_option
}// xxx_pipe
}// xxx_value
Modified: sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.h
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.h (original)
+++ sandbox/assign_v2/libs/assign/v2/test/put/pipe/option/data.h 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -14,11 +14,11 @@
namespace xxx_put{
namespace xxx_pipe{
namespace xxx_option{
-namespace xxx_fun{
+namespace xxx_data{
void test();
-}// xxx_fun
+}// xxx_data
}// xxx_option
}// xxx_pipe
}// xxx_value
Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/framework.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/framework.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/framework.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -13,7 +13,7 @@
#include <boost/test/test_tools.hpp>
#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
-#include <libs/assign/v2/test/framework/modifier.cpp>
+#include <libs/assign/v2/test/interpreter/modifier.cpp>
#include <boost/test/unit_test.hpp>
using boost::unit_test::test_suite;
@@ -22,7 +22,7 @@
test_suite* test = BOOST_TEST_SUITE( "BOOST_ASSIGN_V2" );
using namespace test_assign_v2;
{
- namespace ns = xxx_framework;
+ namespace ns = xxx_interpreter;
test->add( BOOST_TEST_CASE( &ns::xxx_modifier::test ) );
}
return test;
Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/optional.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/optional.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/optional.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -13,11 +13,11 @@
#include <boost/test/test_tools.hpp>
#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
-#include <libs/assign/v2/test/optional/fun.cpp>
-#include <libs/assign/v2/test/optional/iterate.cpp>
-#include <libs/assign/v2/test/optional/lookup.cpp>
-#include <libs/assign/v2/test/optional/repeat.cpp>
-#include <libs/assign/v2/test/optional/standard.cpp>
+#include <libs/assign/v2/test/option/data.cpp>
+#include <libs/assign/v2/test/option/iterate.cpp>
+#include <libs/assign/v2/test/option/mapped.cpp>
+#include <libs/assign/v2/test/option/repeat.cpp>
+#include <libs/assign/v2/test/option/std_modifier.cpp>
#include <boost/test/unit_test.hpp>
@@ -27,10 +27,10 @@
test_suite* test = BOOST_TEST_SUITE( "BOOST_ASSIGN_V2" );
using namespace test_assign_v2;
{
- namespace ns = xxx_optional;
- test->add( BOOST_TEST_CASE( &ns::xxx_fun::test ) );
+ namespace ns = xxx_option;
+ test->add( BOOST_TEST_CASE( &ns::xxx_data::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_iterate::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_lookup::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_mapped::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_repeat::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_standard::test ) );
}
Modified: sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/unit_testing/put.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -14,11 +14,11 @@
#define BOOST_ASSIGN_V2_CHECK( p ) BOOST_CHECK( p )
#include <libs/assign/v2/test/put/pipe/csv_put.cpp>
-#include <libs/assign/v2/test/put/pipe/optional/fun.cpp>
-#include <libs/assign/v2/test/put/pipe/optional/iterate.cpp>
-#include <libs/assign/v2/test/put/pipe/optional/lookup.cpp>
-#include <libs/assign/v2/test/put/pipe/optional/repeat.cpp>
-#include <libs/assign/v2/test/put/pipe/optional/standard.cpp>
+#include <libs/assign/v2/test/put/pipe/option/data.cpp>
+#include <libs/assign/v2/test/put/pipe/option/iterate.cpp>
+#include <libs/assign/v2/test/put/pipe/option/mapped.cpp>
+#include <libs/assign/v2/test/put/pipe/option/repeat.cpp>
+#include <libs/assign/v2/test/put/pipe/option/std_modifier.cpp>
#include <libs/assign/v2/test/put/ptr.cpp>
#include <libs/assign/v2/test/put/put.cpp>
@@ -31,11 +31,11 @@
{
namespace ns = xxx_put;
test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_csv_put::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_optional::xxx_fun::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_optional::xxx_iterate::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_optional::xxx_lookup::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_optional::xxx_repeat::test ) );
- test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_optional::xxx_standard::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_option::xxx_data::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_option::xxx_iterate::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_option::xxx_mapped::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_option::xxx_repeat::test ) );
+ test->add( BOOST_TEST_CASE( &ns::xxx_pipe::xxx_option::xxx_standard::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_ptr::test ) );
test->add( BOOST_TEST_CASE( &ns::xxx_put::test ) );
}
Modified: sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp
==============================================================================
--- sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp (original)
+++ sandbox/assign_v2/libs/assign/v2/test/utility/conversion.cpp 2011-03-22 21:09:53 EDT (Tue, 22 Mar 2011)
@@ -43,7 +43,7 @@
//[test_utility_conversion_vec_array
std::vector<int> r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef array<int, 3> ar_;
- ar_ const& ar = ( r | as2::convert<ar_>() );
+ ar_ const& ar = ( r | as2::_convert<ar_>() );
BOOST_ASSIGN_V2_CHECK( range::equal( ar, as2::csv_deque( 72, 31, 48 ) ) );
//]
@@ -71,9 +71,9 @@
const int sz = 3; typedef array<int, sz> row_;
array<row_, sz> matrix3x3 = converter(
as2::ref::array
- ( as2::ref::csv_array( 1, 2, 3 ) | as2::convert<row_>() )
- ( as2::ref::csv_array( 4, 5, 6 ) | as2::convert<row_>() )
- ( as2::ref::csv_array( 7, 8, 9 ) | as2::convert<row_>() )
+ ( as2::ref::csv_array( 1, 2, 3 ) | as2::_convert<row_>() )
+ ( as2::ref::csv_array( 4, 5, 6 ) | as2::_convert<row_>() )
+ ( as2::ref::csv_array( 7, 8, 9 ) | as2::_convert<row_>() )
);
for(int i = 0; i < 9; i++)
@@ -87,7 +87,7 @@
//[test_utility_conversion_as2_deque_array
std::vector<int> r( 3 ); r[0] = 72; r[1] = 31; r[2] = 48;
typedef array<int, 3> ar_;
- ar_ const& ar = ( as2::csv_deque( 72, 31, 48 ) | as2::convert<ar_>() );
+ ar_ const& ar = ( as2::csv_deque( 72, 31, 48 ) | as2::_convert<ar_>() );
BOOST_ASSIGN_V2_CHECK( range::equal( ar, as2::csv_deque( 72, 31, 48 ) ) );
//]