diff --git a/.travis.yml b/.travis.yml index 9db3bca0..0528f49d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,6 @@ os: - linux - osx -branches: - only: - - master - - develop - env: matrix: - BOGUS_JOB=true @@ -30,6 +25,20 @@ matrix: - os: linux env: TOOLSET=gcc CXXSTD=03,11,1y + - os: linux + env: TOOLSET=gcc-4.4 CXXSTD=98,0x + addons: + apt: + packages: + - g++-4.4 + + - os: linux + env: TOOLSET=gcc-4.6 CXXSTD=03,0x + addons: + apt: + packages: + - g++-4.6 + - os: linux env: TOOLSET=gcc-4.7 CXXSTD=03,11 addons: @@ -153,6 +162,17 @@ matrix: - ubuntu-toolchain-r-test - llvm-toolchain-trusty-4.0 + - os: linux + env: TOOLSET=clang-5.0 CXXSTD=03,11,14,1z,2a + addons: + apt: + packages: + - clang-5.0 + - libstdc++-4.9-dev + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-trusty-5.0 + - os: osx env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z diff --git a/appveyor.yml b/appveyor.yml index d75679ef..4613ff61 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,25 +7,35 @@ version: 1.0.{build}-{branch} shallow_clone: true -branches: - only: - - master - - develop - environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 TOOLSET: msvc-9.0 + CXXSTD: latest # fake - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 TOOLSET: msvc-10.0 + CXXSTD: latest # fake - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 TOOLSET: msvc-11.0 + CXXSTD: latest # fake - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 TOOLSET: msvc-12.0 + CXXSTD: latest # fake - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-14.0 + CXXSTD: 14 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 + TOOLSET: msvc-14.0 + CXXSTD: latest - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 TOOLSET: msvc-14.1 + CXXSTD: 14 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + TOOLSET: msvc-14.1 + CXXSTD: 17 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + TOOLSET: msvc-14.1 + CXXSTD: latest install: - set BOOST_BRANCH=develop @@ -72,4 +82,4 @@ install: build: off test_script: - - b2 -j%NUMBER_OF_PROCESSORS% --hash libs/fusion/test toolset=%TOOLSET% + - b2 -j%NUMBER_OF_PROCESSORS% --hash libs/fusion/test toolset=%TOOLSET% cxxstd=%CXXSTD% diff --git a/include/boost/fusion/container/deque/detail/keyed_element.hpp b/include/boost/fusion/container/deque/detail/keyed_element.hpp index 15b68667..3ab88b92 100644 --- a/include/boost/fusion/container/deque/detail/keyed_element.hpp +++ b/include/boost/fusion/container/deque/detail/keyed_element.hpp @@ -13,6 +13,11 @@ #include #include +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && BOOST_WORKAROUND(BOOST_GCC, / 100 == 404) +#include +#include +#endif + namespace boost { namespace fusion { struct fusion_sequence_tag; @@ -114,8 +119,13 @@ namespace boost { namespace fusion { namespace detail {} #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) +#if BOOST_WORKAROUND(BOOST_GCC, / 100 == 404) + template >::type> +#else + typedef Value Value_; +#endif BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED - keyed_element(Value&& value, Rest&& rest) + keyed_element(Value_&& value, Rest&& rest) : Rest(std::move(rest)) , value_(BOOST_FUSION_FWD_ELEM(Value, value)) {} diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/container/list/cons.hpp index 0dd91b0c..dd7f8873 100644 --- a/include/boost/fusion/container/list/cons.hpp +++ b/include/boost/fusion/container/list/cons.hpp @@ -70,6 +70,10 @@ namespace boost { namespace fusion cons(cons const& rhs) : car(rhs.car), cdr(rhs.cdr) {} +#if BOOST_WORKAROUND(BOOST_GCC, / 100 == 406) && !defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) + // Workaround for `array used as initializer` compile error on gcc 4.6 w/ c++0x. + template +#endif BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED cons(cons const& rhs) : car(rhs.car), cdr(rhs.cdr) {} diff --git a/include/boost/fusion/container/map/detail/map_impl.hpp b/include/boost/fusion/container/map/detail/map_impl.hpp index c62145ba..360c5d09 100644 --- a/include/boost/fusion/container/map/detail/map_impl.hpp +++ b/include/boost/fusion/container/map/detail/map_impl.hpp @@ -125,11 +125,7 @@ namespace boost { namespace fusion { namespace detail } BOOST_FUSION_GPU_ENABLED - value_type get_val(mpl::identity); - BOOST_FUSION_GPU_ENABLED - pair_type get_val(mpl::int_); - BOOST_FUSION_GPU_ENABLED - value_type get_val(mpl::identity) const; + mpl::identity get_val(mpl::identity) const; BOOST_FUSION_GPU_ENABLED pair_type get_val(mpl::int_) const; diff --git a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp index 94d2da47..da6259e6 100644 --- a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp +++ b/include/boost/fusion/container/map/detail/value_at_key_impl.hpp @@ -1,5 +1,6 @@ /*============================================================================= Copyright (c) 2001-2013 Joel de Guzman + Copyright (c) 2018 Kohei Takahashi Distributed under 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) @@ -8,10 +9,6 @@ #define BOOST_FUSION_MAP_DETAIL_VALUE_AT_KEY_IMPL_02042013_0821 #include -#include -#include -#include -#include #include namespace boost { namespace fusion @@ -29,9 +26,9 @@ namespace boost { namespace fusion template struct apply { - typedef - decltype(boost::declval().get_val(mpl::identity())) - type; + typedef typename BOOST_FUSION_IDENTIFIED_TYPE(( + boost::declval().get_val(mpl::identity()) + )) type; }; }; } diff --git a/include/boost/fusion/container/vector/detail/value_at_impl.hpp b/include/boost/fusion/container/vector/detail/value_at_impl.hpp index a2b9b2f6..a2dd5fcd 100644 --- a/include/boost/fusion/container/vector/detail/value_at_impl.hpp +++ b/include/boost/fusion/container/vector/detail/value_at_impl.hpp @@ -1,5 +1,5 @@ /*============================================================================= - Copyright (c) 2014 Kohei Takahashi + Copyright (c) 2014,2018 Kohei Takahashi Distributed under 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) @@ -7,7 +7,6 @@ #ifndef FUSION_VALUE_AT_IMPL_16122014_1641 #define FUSION_VALUE_AT_IMPL_16122014_1641 -#include #include #include @@ -23,6 +22,7 @@ /////////////////////////////////////////////////////////////////////////////// #include #include +#include namespace boost { namespace fusion { @@ -35,7 +35,7 @@ namespace boost { namespace fusion template static inline BOOST_FUSION_GPU_ENABLED - U value_at_impl(store const volatile*); + mpl::identity value_at_impl(store const volatile*); } namespace extension @@ -49,9 +49,9 @@ namespace boost { namespace fusion template struct apply { - typedef - decltype(vector_detail::value_at_impl(boost::declval())) - type; + typedef typename BOOST_FUSION_IDENTIFIED_TYPE(( + vector_detail::value_at_impl(boost::declval()) + )) type; }; }; } diff --git a/include/boost/fusion/support/config.hpp b/include/boost/fusion/support/config.hpp index 16cd8f7f..d27266ed 100644 --- a/include/boost/fusion/support/config.hpp +++ b/include/boost/fusion/support/config.hpp @@ -97,6 +97,18 @@ namespace std #endif +// Workaround for compiler which doesn't compile decltype(expr)::type. +// It expects decltype(expr) deduced as mpl::identity. +#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1913)) || BOOST_WORKAROUND(BOOST_GCC, < 40700) +# include +# define BOOST_FUSION_IDENTIFIED_TYPE(parenthesized_expr) \ + boost::mpl::identity::type::type +#else +# define BOOST_FUSION_IDENTIFIED_TYPE(parenthesized_expr) \ + decltype parenthesized_expr ::type +#endif + + // Workaround for GCC 4.6 that rejects defaulted function with noexcept. #if BOOST_WORKAROUND(BOOST_GCC, / 100 == 406) # define BOOST_FUSION_NOEXCEPT_ON_DEFAULTED diff --git a/meta/explicit-failures-markup.xml b/meta/explicit-failures-markup.xml index 27438953..c2e6ea97 100644 --- a/meta/explicit-failures-markup.xml +++ b/meta/explicit-failures-markup.xml @@ -9,8 +9,8 @@ - - + + The compiler doesn't generate defaulted move ctor/assgin thus perform copy construction/assginment. Even though such case, diff --git a/test/Jamfile b/test/Jamfile index 3a358045..9289033c 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -237,6 +237,7 @@ project [ run sequence/ref_vector.cpp ] [ run sequence/flatten_view.cpp ] [ compile sequence/github-159.cpp ] + [ run sequence/github-176.cpp ] [ compile sequence/size.cpp ] diff --git a/test/sequence/define_struct_inline_move.cpp b/test/sequence/define_struct_inline_move.cpp index 951f7e4f..3c707404 100644 --- a/test/sequence/define_struct_inline_move.cpp +++ b/test/sequence/define_struct_inline_move.cpp @@ -47,8 +47,8 @@ int main() BOOST_TEST(y.w.value == 42); } - // Older MSVCs don't generate move ctor by default. -#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) + // Older MSVCs and gcc 4.4 don't generate move ctor by default. +#if !(defined(CI_SKIP_KNOWN_FAILURE) && (BOOST_WORKAROUND(BOOST_MSVC, < 1900) || BOOST_WORKAROUND(BOOST_GCC, / 100 == 404))) { ns::value x; ns::value y(std::move(x)); // move @@ -66,7 +66,7 @@ int main() BOOST_TEST(x.w.value == 0); BOOST_TEST(y.w.value == 0); } -#endif // !(ci && msvc < 14.0) +#endif // !(ci && (msvc < 14.0 || gcc 4.4.x)) return boost::report_errors(); } diff --git a/test/sequence/define_tpl_struct_inline_move.cpp b/test/sequence/define_tpl_struct_inline_move.cpp index b95da6f6..39a00079 100644 --- a/test/sequence/define_tpl_struct_inline_move.cpp +++ b/test/sequence/define_tpl_struct_inline_move.cpp @@ -47,8 +47,8 @@ int main() BOOST_TEST(y.w.value == 42); } - // Older MSVCs don't generate move ctor by default. -#if !(defined(CI_SKIP_KNOWN_FAILURE) && BOOST_WORKAROUND(BOOST_MSVC, < 1900)) + // Older MSVCs and gcc 4.4 don't generate move ctor by default. +#if !(defined(CI_SKIP_KNOWN_FAILURE) && (BOOST_WORKAROUND(BOOST_MSVC, < 1900) || BOOST_WORKAROUND(BOOST_GCC, / 100 == 404))) { ns::value x; ns::value y(std::move(x)); // move @@ -66,7 +66,7 @@ int main() BOOST_TEST(x.w.value == 0); BOOST_TEST(y.w.value == 0); } -#endif // !(ci && msvc < 14.0) +#endif // !(ci && (msvc < 14.0 || gcc 4.4.x)) return boost::report_errors(); } diff --git a/test/sequence/github-176.cpp b/test/sequence/github-176.cpp new file mode 100644 index 00000000..3301220d --- /dev/null +++ b/test/sequence/github-176.cpp @@ -0,0 +1,89 @@ +/*============================================================================= + Copyright (c) 2018 Kohei Takahashi + + Distributed under 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) +==============================================================================*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +template +void test_at() +{ + Sequence seq; + + // zero initialized + BOOST_TEST(boost::fusion::at_c<0>(seq)[0] == 0); + BOOST_TEST(boost::fusion::at_c<0>(seq)[1] == 0); + BOOST_TEST(boost::fusion::at_c<0>(seq)[2] == 0); + + int (&arr)[3] = boost::fusion::deref(boost::fusion::begin(seq)); + + arr[0] = 2; + arr[1] = 4; + arr[2] = 6; + + BOOST_TEST(boost::fusion::at_c<0>(seq)[0] == 2); + BOOST_TEST(boost::fusion::at_c<0>(seq)[1] == 4); + BOOST_TEST(boost::fusion::at_c<0>(seq)[2] == 6); + + boost::fusion::at_c<0>(seq)[1] = 42; + + BOOST_TEST(boost::fusion::at_c<0>(seq)[0] == 2); + BOOST_TEST(boost::fusion::at_c<0>(seq)[1] == 42); + BOOST_TEST(boost::fusion::at_c<0>(seq)[2] == 6); +} + +template inline T& value(T& v) { return v; } +template inline T& value(boost::fusion::pair& v) { return v.second; } + +template +void test_at_key() +{ + Sequence seq; + + // zero initialized + BOOST_TEST(boost::fusion::at_key(seq)[0] == 0); + BOOST_TEST(boost::fusion::at_key(seq)[1] == 0); + BOOST_TEST(boost::fusion::at_key(seq)[2] == 0); + + int (&arr)[3] = value(boost::fusion::deref(boost::fusion::begin(seq))); + + arr[0] = 2; + arr[1] = 4; + arr[2] = 6; + + BOOST_TEST(boost::fusion::at_key(seq)[0] == 2); + BOOST_TEST(boost::fusion::at_key(seq)[1] == 4); + BOOST_TEST(boost::fusion::at_key(seq)[2] == 6); + + boost::fusion::at_key(seq)[1] = 42; + + BOOST_TEST(boost::fusion::at_key(seq)[0] == 2); + BOOST_TEST(boost::fusion::at_key(seq)[1] == 42); + BOOST_TEST(boost::fusion::at_key(seq)[2] == 6); +} + +int main() +{ + using namespace boost::fusion; + + test_at >(); + test_at >(); + test_at >(); + test_at >(); + +#if !BOOST_WORKAROUND(BOOST_GCC, / 100 == 406) || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS) + // FIXME: gcc 4.6 w/ c++0x doesn't like set with array... + test_at_key >(); +#endif + test_at_key > >(); +} diff --git a/test/sequence/hash.hpp b/test/sequence/hash.hpp index 7dea0a3f..b298f418 100644 --- a/test/sequence/hash.hpp +++ b/test/sequence/hash.hpp @@ -1,5 +1,6 @@ /*============================================================================= Copyright (c) 2014 Christoph Weiss + Copyright (c) 2017 Kohei Takahashi Distributed under 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) @@ -11,24 +12,24 @@ #include #include -void -hash_test() +void hash_test() { - using namespace boost::fusion; + namespace fusion = boost::fusion; + using namespace fusion; const FUSION_SEQUENCE v0(42, 'x', false, "Aurea prima"); const FUSION_SEQUENCE v1(42, 'x', false, "Aurea prima"); - BOOST_TEST(hash_value(v0) == hash_value(v1)); - + BOOST_TEST(fusion::hash_value(v0) == fusion::hash_value(v1)); + const FUSION_SEQUENCE w(41, 'x', false, "Aurea prima"); - BOOST_TEST(hash_value(w) != hash_value(v0)); - + BOOST_TEST(fusion::hash_value(w) != fusion::hash_value(v0)); + const FUSION_SEQUENCE x(42, 'y', false, "Aurea prima"); - BOOST_TEST(hash_value(x) != hash_value(v0)); - + BOOST_TEST(fusion::hash_value(x) != fusion::hash_value(v0)); + const FUSION_SEQUENCE y(42, 'x', true, "Aurea prima"); - BOOST_TEST(hash_value(y) != hash_value(v0)); - + BOOST_TEST(fusion::hash_value(y) != fusion::hash_value(v0)); + const FUSION_SEQUENCE z(42, 'x', false, "quae vindice nullo"); - BOOST_TEST(hash_value(z) != hash_value(v0)); + BOOST_TEST(fusion::hash_value(z) != fusion::hash_value(v0)); } diff --git a/test/sequence/traits.hpp b/test/sequence/traits.hpp index b409936e..3684604e 100644 --- a/test/sequence/traits.hpp +++ b/test/sequence/traits.hpp @@ -1,5 +1,6 @@ /*============================================================================= Copyright (C) 2016 Lee Clagett + Copyright (C) 2018 Kohei Takahashi Distributed under 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) @@ -38,9 +39,7 @@ bool is_convertible(bool has_conversion) } // is_constructible has a few requirements -#if !defined(BOOST_NO_CXX11_DECLTYPE) && \ - !defined(BOOST_NO_CXX11_TEMPLATES) && \ - !defined(BOOST_NO_SFINAE_EXPR) +#ifdef BOOST_TT_IS_CONSTRUCTIBLE_CONFORMING #define FUSION_TEST_HAS_CONSTRUCTIBLE @@ -88,7 +87,9 @@ void test_constructible() BOOST_TEST(( is_constructible, convertible>(true) )); - + + // boost::is_constructible always fail to test ctor which takes 2 or more arguments on GCC 4.7. +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) BOOST_TEST(( is_constructible, int, int>(true) )); @@ -131,6 +132,7 @@ void test_constructible() FUSION_SEQUENCE, convertible, convertible >(true) )); +#endif // !(gcc < 4.7) } #endif // is_constructible is available diff --git a/test/sequence/tuple_traits.cpp b/test/sequence/tuple_traits.cpp index 6d18c231..f065504a 100644 --- a/test/sequence/tuple_traits.cpp +++ b/test/sequence/tuple_traits.cpp @@ -65,10 +65,13 @@ main() BOOST_TEST((is_constructible, int, int>(false))); BOOST_TEST((is_constructible< tuple >(true))); + // boost::is_constructible always fail to test ctor which takes 2 or more arguments on GCC 4.7. +#if !BOOST_WORKAROUND(BOOST_GCC, < 40700) BOOST_TEST((is_constructible, int, int>(true))); BOOST_TEST(( is_constructible, int, int>(true) )); +#endif // !(gcc < 4.7) BOOST_TEST((is_constructible, int, int>(false))); BOOST_TEST((is_constructible, int, int>(false))); BOOST_TEST((