diff --git a/test/algorithm/replace_if.cpp b/test/algorithm/replace_if.cpp index 7327632f..bad5905e 100644 --- a/test/algorithm/replace_if.cpp +++ b/test/algorithm/replace_if.cpp @@ -38,7 +38,7 @@ main() { char const* s = "Ruby"; typedef vector vector_type; - vector_type t1(1, 2, 3.3, 4, s, 5.5); + vector_type t1(1, 2, 3.3, 4, s, 5.5f); { std::cout << replace_if(t1, gt3(), -456) << std::endl; diff --git a/test/sequence/adapt_adt.cpp b/test/sequence/adapt_adt.cpp index bf5d4ca0..528c72c7 100644 --- a/test/sequence/adapt_adt.cpp +++ b/test/sequence/adapt_adt.cpp @@ -185,9 +185,9 @@ main() } { - fusion::vector v1(4, 2, 2); + fusion::vector v1(4, 2.f, 2); ns::point v2(5, 3, 3); - fusion::vector v3(5, 4, 4); + fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_adt_named.cpp b/test/sequence/adapt_adt_named.cpp index f7e115aa..7cadb0bc 100644 --- a/test/sequence/adapt_adt_named.cpp +++ b/test/sequence/adapt_adt_named.cpp @@ -115,11 +115,11 @@ main() } { - fusion::vector v1(4, 2, 2); + fusion::vector v1(4, 2.f, 2); ns::point basep(5, 3, 3); adapted::point v2(basep); - fusion::vector v3(5, 4, 4); + fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_adt.cpp b/test/sequence/adapt_assoc_adt.cpp index fca3941d..97920621 100644 --- a/test/sequence/adapt_assoc_adt.cpp +++ b/test/sequence/adapt_assoc_adt.cpp @@ -105,9 +105,9 @@ main() } { - boost::fusion::vector v1(4, 2, 2); + boost::fusion::vector v1(4, 2.f, 2); ns::point v2(5, 3, 3); - boost::fusion::vector v3(5, 4, 4); + boost::fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_adt_named.cpp b/test/sequence/adapt_assoc_adt_named.cpp index d685528d..5a88227f 100644 --- a/test/sequence/adapt_assoc_adt_named.cpp +++ b/test/sequence/adapt_assoc_adt_named.cpp @@ -86,10 +86,10 @@ main() } { - boost::fusion::vector v1(4, 2); + boost::fusion::vector v1(4, 2.f); ns::point basev2(5, 3); adapted::point v2(basev2); - boost::fusion::vector v3(5, 4); + boost::fusion::vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_struct.cpp b/test/sequence/adapt_assoc_struct.cpp index 6bb4a8ee..11362580 100644 --- a/test/sequence/adapt_assoc_struct.cpp +++ b/test/sequence/adapt_assoc_struct.cpp @@ -107,9 +107,9 @@ main() } { - fusion::vector v1(4, 2, 2); + fusion::vector v1(4, 2.f, 2); ns::point v2 = {5, 3, 3}; - fusion::vector v3(5, 4, 4); + fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_struct_named.cpp b/test/sequence/adapt_assoc_struct_named.cpp index fd7fdc50..eed7ffa7 100644 --- a/test/sequence/adapt_assoc_struct_named.cpp +++ b/test/sequence/adapt_assoc_struct_named.cpp @@ -72,11 +72,11 @@ main() } { - vector v1(4, 2); + vector v1(4, 2.f); ns::point basev2 = {5, 3}; adapted::point v2(basev2); - vector v3(5, 4); + vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_tpl_adt.cpp b/test/sequence/adapt_assoc_tpl_adt.cpp index e0b89dca..c10d8754 100644 --- a/test/sequence/adapt_assoc_tpl_adt.cpp +++ b/test/sequence/adapt_assoc_tpl_adt.cpp @@ -119,9 +119,9 @@ main() } { - boost::fusion::vector v1(4, 2, 2); + boost::fusion::vector v1(4, 2.f, 2); point v2(5, 3, 3); - boost::fusion::vector v3(5, 4, 4); + boost::fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_assoc_tpl_struct.cpp b/test/sequence/adapt_assoc_tpl_struct.cpp index a949dad0..02ef5484 100644 --- a/test/sequence/adapt_assoc_tpl_struct.cpp +++ b/test/sequence/adapt_assoc_tpl_struct.cpp @@ -117,9 +117,9 @@ main() } { - vector v1(4, 2, 2); - point v2 = {5, 3, 3}; - vector v3(5, 4, 4.13f); + vector v1(4, 2.f, 2); + point v2 = {5, 3, 3.f}; + vector v3(5, 4., 4.13f); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); @@ -132,14 +132,14 @@ main() { // conversion from point to vector - point p = {5, 3, 3}; + point p = {5, 3, 3.f}; vector v(p); v = p; } { // conversion from point to list - point p = {5, 3, 3}; + point p = {5, 3, 3.f}; list l(p); l = p; } @@ -155,7 +155,7 @@ main() BOOST_MPL_ASSERT((boost::is_same::type, int>)); BOOST_MPL_ASSERT((boost::is_same::type, float>)); - point p = {5, 3, 9}; + point p = {5, 3, 9.f}; BOOST_TEST(at_key(p) == 5); BOOST_TEST(at_key(p) == 3); diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp index e4c8f6ee..9c7e26d7 100644 --- a/test/sequence/adapt_struct.cpp +++ b/test/sequence/adapt_struct.cpp @@ -186,9 +186,9 @@ main() } { - vector v1(4, 2, 2); + vector v1(4, 2.f, 2); point v2 = {5, 3, 3}; - vector v3(5, 4, 4); + vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); @@ -243,7 +243,7 @@ main() #endif { - fusion::vector v1(4, 2); + fusion::vector v1(4, 2.f); ns::bar v2 = {{5}, 3}; BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); diff --git a/test/sequence/adapt_struct_named.cpp b/test/sequence/adapt_struct_named.cpp index 63fc3f5f..29b27373 100644 --- a/test/sequence/adapt_struct_named.cpp +++ b/test/sequence/adapt_struct_named.cpp @@ -109,11 +109,11 @@ main() } { - fusion::vector v1(4, 2, 2); + fusion::vector v1(4, 2.f, 2); ns::point p = {5, 3, 3}; adapted::point v2(p); - fusion::vector v3(5, 4, 4); + fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_tpl_adt.cpp b/test/sequence/adapt_tpl_adt.cpp index c454baa5..b544ad17 100644 --- a/test/sequence/adapt_tpl_adt.cpp +++ b/test/sequence/adapt_tpl_adt.cpp @@ -128,9 +128,9 @@ main() } { - boost::fusion::vector v1(4, 2, 2); + boost::fusion::vector v1(4, 2.f, 2); point v2(5, 3, 3); - boost::fusion::vector v3(5, 4, 4); + boost::fusion::vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/adapt_tpl_struct.cpp b/test/sequence/adapt_tpl_struct.cpp index 861bab65..53937dca 100644 --- a/test/sequence/adapt_tpl_struct.cpp +++ b/test/sequence/adapt_tpl_struct.cpp @@ -117,9 +117,9 @@ main() } { - vector v1(4, 2, 2); + vector v1(4, 2.f, 2); point v2 = {5, 3, 3}; - vector v3(5, 4, 4); + vector v3(5, 4., 4); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_assoc_struct.cpp b/test/sequence/define_assoc_struct.cpp index ed8dfbe0..c8caac1c 100644 --- a/test/sequence/define_assoc_struct.cpp +++ b/test/sequence/define_assoc_struct.cpp @@ -59,9 +59,9 @@ main() } { - vector v1(4, 2); + vector v1(4, 2.f); ns::point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_assoc_tpl_struct.cpp b/test/sequence/define_assoc_tpl_struct.cpp index 6d0b5bdb..f7986395 100644 --- a/test/sequence/define_assoc_tpl_struct.cpp +++ b/test/sequence/define_assoc_tpl_struct.cpp @@ -63,9 +63,9 @@ main() } { - vector v1(4, 2); + vector v1(4, 2.f); point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.0); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_struct.cpp b/test/sequence/define_struct.cpp index d91dda95..f4862548 100644 --- a/test/sequence/define_struct.cpp +++ b/test/sequence/define_struct.cpp @@ -71,9 +71,9 @@ main() } { - vector v1(4, 2); + vector v1(4, 2.f); ns::point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.0); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_struct_inline.cpp b/test/sequence/define_struct_inline.cpp index d34a142b..3a902372 100644 --- a/test/sequence/define_struct_inline.cpp +++ b/test/sequence/define_struct_inline.cpp @@ -85,9 +85,9 @@ void run_test() } { - vector v1(4, 2); + vector v1(4, 2.0f); Point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_tpl_struct.cpp b/test/sequence/define_tpl_struct.cpp index 9896493c..586e21cf 100644 --- a/test/sequence/define_tpl_struct.cpp +++ b/test/sequence/define_tpl_struct.cpp @@ -59,9 +59,9 @@ main() } { - vector v1(4, 2); + vector v1(4, 2.f); point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/define_tpl_struct_inline.cpp b/test/sequence/define_tpl_struct_inline.cpp index fad064f7..18fdb0d1 100644 --- a/test/sequence/define_tpl_struct_inline.cpp +++ b/test/sequence/define_tpl_struct_inline.cpp @@ -80,9 +80,9 @@ void run_test() } { - vector v1(4, 2); + vector v1(4, 2.f); Point v2(5, 3); - vector v3(5, 4); + vector v3(5, 4.); BOOST_TEST(v1 < v2); BOOST_TEST(v1 <= v2); BOOST_TEST(v2 > v1); diff --git a/test/sequence/vector_n.cpp b/test/sequence/vector_n.cpp index 05c07ce4..2109bd5c 100644 --- a/test/sequence/vector_n.cpp +++ b/test/sequence/vector_n.cpp @@ -136,7 +136,7 @@ main() { typedef vector7 type; - type vec(false, 'x', 3, 4, 5, 6.0, 7.0); + type vec(false, 'x', 3, 4, 5, 6.f, 7.0); BOOST_TEST(at_c<0>(vec) == false); BOOST_TEST(at_c<1>(vec) == 'x');