feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

Clean up MSVC build. Fixes #1619. Fixes #3074.

Browse Source 
[SVN r62854]
This commit is contained in:
Steven Watanabe
2010-06-12 15:58:31 +00:00
parent d5f6d5eafe
commit 7c986ebd61
62 changed files with 313 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/sequence/adapt_assoc_class.cpp
View File

@ -98,14 +98,14 @@ main()
{
// conversion from ns::point to vector
ns::point p(5, 3);
boost::fusion::vector<int, short> v(p);
boost::fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p(5, 3);
boost::fusion::list<int, short> l(p);
boost::fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_assoc_class_named.cpp
View File

@ -102,7 +102,7 @@ main()
// conversion from adapted::point to vector
ns::point basep(5, 3);
adapted::point p(basep);
boost::fusion::vector<int, short> v(p);
boost::fusion::vector<int, long> v(p);
v = p;
}
@ -110,7 +110,7 @@ main()
// conversion from adated::point to list
ns::point basep(5, 3);
adapted::point p(basep);
boost::fusion::list<int, short> l(p);
boost::fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_assoc_struct.cpp
View File

@ -104,14 +104,14 @@ main()
{
// conversion from ns::point to vector
ns::point p = {5, 3};
fusion::vector<int, short> v(p);
fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p = {5, 3};
fusion::list<int, short> l(p);
fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_assoc_struct_named.cpp
View File

@ -88,7 +88,7 @@ main()
// conversion from adapted::point to vector
ns::point basep = {5, 3};
adapted::point p(basep);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
@ -96,7 +96,7 @@ main()
// conversion from adapted::point to list
ns::point basep = {5, 3};
adapted::point p(basep);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_assoc_tpl_class.cpp
View File

@ -102,14 +102,14 @@ main()
{
// conversion from point to vector
point p(5, 3);
boost::fusion::vector<int, short> v(p);
boost::fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p(5, 3);
boost::fusion::list<int, short> l(p);
boost::fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_assoc_tpl_struct.cpp
View File

@ -102,14 +102,14 @@ main()
{
// conversion from point to vector
point p = {5, 3};
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p = {5, 3};
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_class.cpp
View File

@ -106,14 +106,14 @@ main()
{
// conversion from ns::point to vector
ns::point p(5, 3);
fusion::vector<int, short> v(p);
fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p(5, 3);
fusion::list<int, short> l(p);
fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_class_named.cpp
View File

@ -112,7 +112,7 @@ main()
ns::point basep(5, 3);
adapted::point p(basep);
fusion::vector<int, short> v(p);
fusion::vector<int, long> v(p);
v = p;
}
@ -121,7 +121,7 @@ main()
ns::point basep(5, 3);
adapted::point p(basep);
fusion::list<int, short> l(p);
fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_struct.cpp
View File

@ -97,14 +97,14 @@ main()
{
// conversion from ns::point to vector
ns::point p = {5, 3};
fusion::vector<int, short> v(p);
fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p = {5, 3};
fusion::list<int, short> l(p);
fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_struct_named.cpp
View File

@ -103,7 +103,7 @@ main()
// conversion from adapted::point to vector
ns::point basep = {5, 3};
adapted::point p(basep);
fusion::vector<int, short> v(p);
fusion::vector<int, long> v(p);
v = p;
}
@ -111,7 +111,7 @@ main()
// conversion from adapted::point to list
ns::point basep = {5, 3};
adapted::point p(basep);
fusion::list<int, short> l(p);
fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_tpl_class.cpp
View File

@ -110,14 +110,14 @@ main()
{
// conversion from point to vector
point p(5, 3);
boost::fusion::vector<int, short> v(p);
boost::fusion::vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p(5, 3);
boost::fusion::list<int, short> l(p);
boost::fusion::list<int, long> l(p);
l = p;
}

4
test/sequence/adapt_tpl_struct.cpp
View File

@ -97,14 +97,14 @@ main()
{
// conversion from point to vector
point p = {5, 3};
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p = {5, 3};
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

9
test/sequence/cons.cpp
View File

@ -26,6 +26,7 @@ main()
{
using namespace boost::fusion;
using boost::is_same;
namespace fusion = boost::fusion;
std::cout << tuple_open('[');
std::cout << tuple_close(']');
@ -39,18 +40,18 @@ main()
make_cons(1, make_cons(hello));
BOOST_TEST((*begin(ns) == 1));
BOOST_TEST((*next(begin(ns)) == hello));
BOOST_TEST((*fusion::next(begin(ns)) == hello));
*begin(ns) += 1;
*next(begin(ns)) += ' ';
*fusion::next(begin(ns)) += ' ';
BOOST_TEST((*begin(ns) == 2));
BOOST_TEST((*next(begin(ns)) == hello + ' '));
BOOST_TEST((*fusion::next(begin(ns)) == hello + ' '));
for_each(ns, boost::lambda::_1 += ' ');
BOOST_TEST((*begin(ns) == 2 + ' '));
BOOST_TEST((*next(begin(ns)) == hello + ' ' + ' '));
BOOST_TEST((*fusion::next(begin(ns)) == hello + ' ' + ' '));
}
{

4
test/sequence/define_assoc_struct.cpp
View File

@ -75,14 +75,14 @@ main()
{
// conversion from ns::point to vector
ns::point p(5, 3);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p(5, 3);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

4
test/sequence/define_assoc_tpl_struct.cpp
View File

@ -79,14 +79,14 @@ main()
{
// conversion from point to vector
point p(5, 3);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p(5, 3);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

4
test/sequence/define_struct.cpp
View File

@ -72,14 +72,14 @@ main()
{
// conversion from ns::point to vector
ns::point p(5, 3);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p(5, 3);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

4
test/sequence/define_tpl_struct.cpp
View File

@ -75,14 +75,14 @@ main()
{
// conversion from point to vector
point p(5, 3);
vector<int, short> v(p);
vector<int, long> v(p);
v = p;
}
{
// conversion from point to list
point p(5, 3);
list<int, short> l(p);
list<int, long> l(p);
l = p;
}

5
test/sequence/iterator_range.cpp
View File

@ -28,6 +28,7 @@ int
main()
{
using namespace boost::fusion;
namespace fusion = boost::fusion;
std::cout << tuple_open('[');
std::cout << tuple_close(']');
@ -104,9 +105,9 @@ main()
BOOST_MPL_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<range_type>::type>::type>::type, char>));
std::cout << deref_data(begin(r)) << std::endl;
std::cout << deref_data(next(begin(r))) << std::endl;
std::cout << deref_data(fusion::next(begin(r))) << std::endl;
BOOST_TEST((deref_data(begin(r)) == "foo"));
BOOST_TEST((deref_data(next(begin(r))) == 'x'));
BOOST_TEST((deref_data(fusion::next(begin(r))) == 'x'));
}
return boost::report_errors();

9
test/sequence/joint_view.cpp
View File

@ -34,6 +34,7 @@ int
main()
{
using namespace boost::fusion;
namespace fusion = boost::fusion;
std::cout << tuple_open('[');
std::cout << tuple_close(']');
@ -175,11 +176,11 @@ main()
, float>));
std::cout << deref_data(begin(j)) << std::endl;
std::cout << deref_data(boost::fusion::next(begin(j))) << std::endl;
std::cout << deref_data(next(boost::fusion::next(begin(j)))) << std::endl;
std::cout << deref_data(fusion::next(begin(j))) << std::endl;
std::cout << deref_data(fusion::next(fusion::next(begin(j)))) << std::endl;
BOOST_TEST((deref_data(begin(j)) == 0));
BOOST_TEST((deref_data(boost::fusion::next(begin(j))) == "foo"));
BOOST_TEST((deref_data(next(boost::fusion::next(begin(j)))) == 1.3f));
BOOST_TEST((deref_data(fusion::next(begin(j))) == "foo"));
BOOST_TEST((deref_data(fusion::next(fusion::next(begin(j)))) == 1.3f));
}
return boost::report_errors();

13
test/sequence/map.cpp
View File

@ -29,6 +29,7 @@ main()
using namespace boost::fusion;
using namespace boost;
using namespace std;
namespace fusion = boost::fusion;
using boost::fusion::pair;
using boost::fusion::make_pair;
@ -66,15 +67,15 @@ main()
BOOST_STATIC_ASSERT((!result_of::has_key<map_type, std::string>::value));
std::cout << deref_data(begin(m)) << std::endl;
std::cout << deref_data(next(begin(m))) << std::endl;
std::cout << deref_data(fusion::next(begin(m))) << std::endl;
BOOST_TEST(deref_data(begin(m)) == 'X');
BOOST_TEST(deref_data(next(begin(m))) == "Men");
BOOST_TEST(deref_data(fusion::next(begin(m))) == "Men");
BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<map_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<map_type>::type>::type>::type, double>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<map_type>::type>::type, char>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<map_type>::type>::type>::type, std::string>::value));
}
{

2
test/sequence/misc.hpp
View File

@ -151,7 +151,7 @@ test()
{ // testing front & back
typedef FUSION_SEQUENCE<int, float, std::string> tup;
tup t(1, 2.2, "Kimpo");
tup t(1, 2.2f, "Kimpo");
BOOST_TEST(front(t) == 1);
#if !defined(FUSION_FORWARD_ONLY) // list has no back

13
test/sequence/set.cpp
View File

@ -29,6 +29,7 @@ main()
using namespace boost::fusion;
using namespace boost;
using namespace std;
namespace fusion = boost::fusion;
using boost::fusion::pair;
using boost::fusion::make_pair;
@ -61,15 +62,15 @@ main()
BOOST_STATIC_ASSERT((!result_of::has_key<set_type, double>::value));
std::cout << deref_data(begin(m)) << std::endl;
std::cout << deref_data(next(begin(m))) << std::endl;
std::cout << deref_data(fusion::next(begin(m))) << std::endl;
BOOST_TEST(deref_data(begin(m)) == 123);
BOOST_TEST(deref_data(next(begin(m))) == "Hola");
BOOST_TEST(deref_data(fusion::next(begin(m))) == "Hola");
BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::begin<set_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::key_of<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::begin<set_type>::type>::type, int>::value));
BOOST_STATIC_ASSERT((boost::is_same<result_of::value_of_data<result_of::next<result_of::begin<set_type>::type>::type>::type, std::string>::value));
}
{

2
test/sequence/tr1_tuple_auto_conv.cpp
View File

@ -48,7 +48,7 @@ namespace Core
} // namespace Core
int main(int argc, char* argv[])
int main()
{
std::tr1::tuple<int, int, int, int> test = Core::Demo();
return 0;