|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r56150 - in sandbox/SOC/2009/fusion: . libs/fusion/test/sequence
From: mr.chr.schmidt_at_[hidden]
Date: 2009-09-11 14:16:42
Author: cschmidt
Date: 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
New Revision: 56150
URL: http://svn.boost.org/trac/boost/changeset/56150
Log:
removed unnecessary sequence_assign's
Text files modified:
sandbox/SOC/2009/fusion/build.bat | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp | 4 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_struct.cpp | 4 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_list.cpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_map.cpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_set.cpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_vector.cpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/boost_tuple.cpp | 4 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/construction.hpp | 6 +++---
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/copy.hpp | 4 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/deduce_sequence.cpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/std_pair.cpp | 4 ++--
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/value_at.hpp | 2 +-
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/vector_n.cpp | 8 ++++----
sandbox/SOC/2009/fusion/project-root.jam | 2 +-
15 files changed, 25 insertions(+), 25 deletions(-)
Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat (original)
+++ sandbox/SOC/2009/fusion/build.bat 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -22,7 +22,7 @@
call :gcc3
) else (
if "%1" == "" (
- call :vc9
+ call :gcc4
) else (
echo Unknown toolset '%1'
goto :eof
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -102,14 +102,14 @@
{
// conversion from ns::point to vector
ns::point p = {5, 3};
- vector<int, short> v(sequence_assign(p));
+ vector<int, short> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p = {5, 3};
- list<int, short> l(sequence_assign(p));
+ list<int, short> l(p);
l = p;
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_struct.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_struct.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_struct.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -94,14 +94,14 @@
{
// conversion from ns::point to vector
ns::point p = {5, 3};
- vector<int, short> v(sequence_assign(p));
+ vector<int, short> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p = {5, 3};
- list<int, short> l(sequence_assign(p));
+ list<int, short> l(p);
l = p;
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_list.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_list.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_list.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -42,7 +42,7 @@
{
// test conversion
- list<int, std::string> l(sequence_assign(make_vector(123, "harru")));
+ list<int, std::string> l(make_vector(123, "harru"));
BOOST_TEST(l == make_vector(123, "harru"));
l = (make_vector(235, "hola")); // test assign
BOOST_TEST(l == make_vector(235, "hola"));
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_map.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_map.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_map.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -49,7 +49,7 @@
, pair<double, std::string> >
map_type;
- map_type m(sequence_assign(make_vector(make_pair<int>('X'), make_pair<double>("Men"))));
+ map_type m(make_vector(make_pair<int>('X'), make_pair<double>("Men")));
BOOST_TEST(as_vector(m) == make_vector(make_pair<int>('X'), make_pair<double>("Men")));
m = (make_vector(make_pair<int>('X'), make_pair<double>("Men"))); // test assign
BOOST_TEST(as_vector(m) == make_vector(make_pair<int>('X'), make_pair<double>("Men")));
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_set.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_set.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_set.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -52,7 +52,7 @@
{
// test conversion
- set<int, std::string> s(sequence_assign(make_vector(123, "harru")));
+ set<int, std::string> s(make_vector(123, "harru"));
BOOST_TEST(as_vector(s) == make_vector(123, "harru"));
s = (make_vector(235, "hola")); // test assign
BOOST_TEST(as_vector(s) == make_vector(235, "hola"));
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_vector.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_vector.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/as_vector.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -43,7 +43,7 @@
{
// test conversion
- vector<int, std::string> v(sequence_assign(make_list(123, "harru")));
+ vector<int, std::string> v(make_list(123, "harru"));
BOOST_TEST(v == make_list(123, "harru"));
v = (make_list(235, "hola")); // test assign
BOOST_TEST(v == make_list(235, "hola"));
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/boost_tuple.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/boost_tuple.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/boost_tuple.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -73,13 +73,13 @@
{
// conversion from boost tuple to vector
- vector<int, std::string> v(sequence_assign(boost::tuples::make_tuple(123, "Hola!!!")));
+ vector<int, std::string> v(boost::tuples::make_tuple(123, "Hola!!!"));
v = boost::tuples::make_tuple(123, "Hola!!!");
}
{
// conversion from boost tuple to list
- list<int, std::string> l(sequence_assign(boost::tuples::make_tuple(123, "Hola!!!")));
+ list<int, std::string> l(boost::tuples::make_tuple(123, "Hola!!!"));
l = boost::tuples::make_tuple(123, "Hola!!!");
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/construction.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/construction.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/construction.hpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -58,7 +58,7 @@
FUSION_SEQUENCE<> empty0;
#ifndef TR1_TUPLE_TEST
- FUSION_SEQUENCE<> empty1(sequence_assign(empty));
+ FUSION_SEQUENCE<> empty1(empty);
#endif
FUSION_SEQUENCE<int> t1;
@@ -70,7 +70,7 @@
FUSION_SEQUENCE<foo> t3(foo(12));
BOOST_TEST(FUSION_AT<0>(t3) == foo(12));
- FUSION_SEQUENCE<double> t4(sequence_assign(t2));
+ FUSION_SEQUENCE<double> t4(t2);
BOOST_TEST(FUSION_AT<0>(t4) > 5.4 && FUSION_AT<0>(t4) < 5.6);
FUSION_SEQUENCE<int, float> t5;
@@ -85,7 +85,7 @@
BOOST_TEST(FUSION_AT<0>(t7) == 12);
BOOST_TEST(FUSION_AT<1>(t7) > 5.4f && FUSION_AT<1>(t7) < 5.6f);
- FUSION_SEQUENCE<long, double> t8(sequence_assign(t6));
+ FUSION_SEQUENCE<long, double> t8(t6);
BOOST_TEST(FUSION_AT<0>(t8) == 12);
BOOST_TEST(FUSION_AT<1>(t8) > 5.4f && FUSION_AT<1>(t8) < 5.6f);
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/copy.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/copy.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/copy.hpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -39,7 +39,7 @@
boost::fusion::FUSION_SEQUENCE<double, double, double, double>
foo(int i)
{
- return sequence_assign(boost::fusion::FUSION_MAKE(i, i+1, i+2, i+3));
+ return boost::fusion::FUSION_MAKE(i, i+1, i+2, i+3);
}
void test_mpl()
@@ -81,7 +81,7 @@
// between elements testing tie
FUSION_SEQUENCE<char, BB*, BB, DD> t;
- FUSION_SEQUENCE<int, AA*, CC, CC> a(sequence_assign(t));
+ FUSION_SEQUENCE<int, AA*, CC, CC> a(t);
a = t;
int i; char c; double d;
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/deduce_sequence.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/deduce_sequence.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/deduce_sequence.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -27,7 +27,7 @@
typename deduce_sequence<Args>::type fsq_args;
test_seq_ctor(Args const& args)
- : fsq_args(sequence_assign(args))
+ : fsq_args(args)
{}
};
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/std_pair.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/std_pair.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/std_pair.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -77,13 +77,13 @@
{
// conversion from pair to vector
- vector<int, std::string> v(sequence_assign(std::make_pair(123, "Hola!!!")));
+ vector<int, std::string> v(std::make_pair(123, "Hola!!!"));
v = std::make_pair(123, "Hola!!!");
}
{
// conversion from pair to list
- list<int, std::string> l(sequence_assign(std::make_pair(123, "Hola!!!")));
+ list<int, std::string> l(std::make_pair(123, "Hola!!!"));
l = std::make_pair(123, "Hola!!!");
}
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/value_at.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/value_at.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/value_at.hpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -37,7 +37,7 @@
double d = 2.7;
A a;
FUSION_SEQUENCE<int, double&, const A&, int> t(1, d, a, 2);
- const FUSION_SEQUENCE<int, double&, const A, int> ct(sequence_assign(t));
+ const FUSION_SEQUENCE<int, double&, const A, int> ct(t);
int i = FUSION_AT<0>(t);
int i2 = FUSION_AT<3>(t);
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/vector_n.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/vector_n.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/vector_n.cpp 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -71,7 +71,7 @@
{
vector1<int> t1(123L); // try conversion from long to int
- vector1<double> t2(sequence_assign(t1)); // try copy
+ vector1<double> t2(t1); // try copy
(void)t2;
}
@@ -97,7 +97,7 @@
{
vector2<int, int> t1(123, 456);
- vector2<double, float> t2(sequence_assign(t1));
+ vector2<double, float> t2(t1);
(void)t2;
}
@@ -209,7 +209,7 @@
{
// testing copy and assign from a view
vector0<> empty;
- vector2<int, long> v(sequence_assign(push_back(push_back(empty, 123), 456)));
+ vector2<int, long> v(push_back(push_back(empty, 123), 456));
cout << v << endl;
BOOST_TEST(at_c<0>(v) == 123);
BOOST_TEST(at_c<1>(v) == 456);
@@ -222,7 +222,7 @@
{
// testing copy and assign from a vector_c
boost::mpl::vector_c<int, 123, 456> vec_c;
- vector2<int, long> v(sequence_assign(vec_c));
+ vector2<int, long> v(vec_c);
std::cout << v << std::endl;
BOOST_TEST(at_c<0>(v) == 123);
BOOST_TEST(at_c<1>(v) == 456);
Modified: sandbox/SOC/2009/fusion/project-root.jam
==============================================================================
--- sandbox/SOC/2009/fusion/project-root.jam (original)
+++ sandbox/SOC/2009/fusion/project-root.jam 2009-09-11 14:16:41 EDT (Fri, 11 Sep 2009)
@@ -14,7 +14,7 @@
<include>$(BOOST_INCLUDES_PATH)
<define>BOOST_FUSION_ENABLE_STATIC_ASSERTS
# <define>BOOST_FUSION_PREFER_MPL
-# <toolset>gcc:<cxxflags>-std=c++0x
+ <toolset>gcc:<cxxflags>-std=c++0x
: build-dir ../bin
: default-build debug <link>shared <runtime-link>shared <threading>multi
;
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