From c853c803dd58db19a5e8578ef622dfe54833ddc6 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 26 Sep 2013 13:02:51 +0000 Subject: [PATCH 01/29] Remove obsolete MSVC check from pragma guard git grep -h -B1 "^#\s*pragma once" | grep -v pragma | sort | uniq is now clean. [SVN r85952] --- include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/has_unique.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp | 2 +- include/boost/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp b/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp index b18067a..e0144e9 100644 --- a/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/has_equal_range.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp b/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp index eca0eb1..da6baa0 100644 --- a/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/has_lower_bound.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp b/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp index e8f311f..22a0087 100644 --- a/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/has_remove_if.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp b/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp index 2cb425e..f514fcf 100644 --- a/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/has_reverse.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp b/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp index 5f1b547..a5b12c4 100644 --- a/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/has_unique.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) #pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp b/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp index 52c87e9..e44a047 100644 --- a/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/is_std_set.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) # pragma once #endif diff --git a/include/boost/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp b/include/boost/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp index d78c6b7..93131f0 100644 --- a/include/boost/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp +++ b/include/boost/phoenix/stl/algorithm/detail/std_hash_map_fwd.hpp @@ -12,7 +12,7 @@ // ///////////////////////////////////////////////////////////////////////////// -#if defined(_MSC_VER) && _MSC_VER >= 1000 +#if defined(_MSC_VER) # pragma once #endif From 45b4ccfb51607f39bb41f9c6b589fb0742cf7ba5 Mon Sep 17 00:00:00 2001 From: K-ballo Date: Mon, 16 Dec 2013 19:29:34 -0600 Subject: [PATCH 02/29] Removed checks for v2 --- include/boost/phoenix/bind.hpp | 4 ---- include/boost/phoenix/core.hpp | 4 ---- include/boost/phoenix/fusion.hpp | 4 ---- include/boost/phoenix/object.hpp | 4 ---- include/boost/phoenix/statement.hpp | 4 ---- include/boost/phoenix/stl.hpp | 4 ---- 6 files changed, 24 deletions(-) diff --git a/include/boost/phoenix/bind.hpp b/include/boost/phoenix/bind.hpp index 8ebffb6..1a40908 100644 --- a/include/boost/phoenix/bind.hpp +++ b/include/boost/phoenix/bind.hpp @@ -7,14 +7,10 @@ #ifndef BOOST_PHOENIX_BIND_HPP #define BOOST_PHOENIX_BIND_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include -#else #include #include #include #include #include -#endif #endif diff --git a/include/boost/phoenix/core.hpp b/include/boost/phoenix/core.hpp index 0eb2bc8..b6f0d83 100644 --- a/include/boost/phoenix/core.hpp +++ b/include/boost/phoenix/core.hpp @@ -7,9 +7,6 @@ #ifndef BOOST_PHOENIX_CORE_HPP #define BOOST_PHOENIX_CORE_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include -#else #include #include #include @@ -21,6 +18,5 @@ #include #include #include -#endif #endif diff --git a/include/boost/phoenix/fusion.hpp b/include/boost/phoenix/fusion.hpp index 1443b69..14319b1 100644 --- a/include/boost/phoenix/fusion.hpp +++ b/include/boost/phoenix/fusion.hpp @@ -8,10 +8,6 @@ #ifndef BOOST_PHOENIX_FUSION_HPP #define BOOST_PHOENIX_FUSION_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include -#else #include -#endif #endif diff --git a/include/boost/phoenix/object.hpp b/include/boost/phoenix/object.hpp index 6e4b528..9fec3b3 100644 --- a/include/boost/phoenix/object.hpp +++ b/include/boost/phoenix/object.hpp @@ -8,9 +8,6 @@ #ifndef BOOST_PHOENIX_OBJECT_HPP #define BOOST_PHOENIX_OBJECT_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include -#else #include #include #include @@ -18,6 +15,5 @@ #include #include #include -#endif #endif diff --git a/include/boost/phoenix/statement.hpp b/include/boost/phoenix/statement.hpp index 23c04ad..fc78379 100644 --- a/include/boost/phoenix/statement.hpp +++ b/include/boost/phoenix/statement.hpp @@ -7,9 +7,6 @@ #ifndef BOOST_PHOENIX_STATEMENT_HPP #define BOOST_PHOENIX_STATEMENT_HPP -#ifdef BOOST_PHOENIX_USE_V2_OVER_V3 -#include -#else #include #include #include @@ -19,6 +16,5 @@ #include #include #include -#endif #endif diff --git a/include/boost/phoenix/stl.hpp b/include/boost/phoenix/stl.hpp index 834c129..c1013bc 100644 --- a/include/boost/phoenix/stl.hpp +++ b/include/boost/phoenix/stl.hpp @@ -9,11 +9,7 @@ #ifndef BOOST_PHOENIX_STL_HPP #define BOOST_PHOENIX_STL_HPP -#ifdef BOOST_PHOENIX_USE_V2 -#include -#else #include #include -#endif #endif From 5c9aa2487d7ec5fea2c37f21eb5deba45acbf463 Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Sun, 19 Jan 2014 22:54:47 -0800 Subject: [PATCH 03/29] update Phoenix preprocess for modularization --- preprocess/Jamfile.v2 | 4 +++- preprocess/preprocess_phoenix.cpp | 22 +++++++++++----------- preprocess/wave-msvc-10.0.cfg | 1 + preprocess/wave.cfg | 5 ++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/preprocess/Jamfile.v2 b/preprocess/Jamfile.v2 index ec8327e..ffd3614 100644 --- a/preprocess/Jamfile.v2 +++ b/preprocess/Jamfile.v2 @@ -4,6 +4,8 @@ # Generates preprocessed files with wave. +project : requirements static release ; + import feature ; import toolset ; @@ -16,7 +18,7 @@ actions wave bind PHOENIX-LIMIT $(>[2]) -o- -DBOOST_PHOENIX_LIMIT=$(PHOENIX-LIMIT) --config-file wave.cfg $(>[1]) } -W = ../../../tools/wave/build//wave ; +W = /boost/libs/wave/tool//wave ; make preprocess_phoenix_10 : preprocess_phoenix.cpp $(W) : wave : 10 diff --git a/preprocess/preprocess_phoenix.cpp b/preprocess/preprocess_phoenix.cpp index 4c8788d..4bb1a6a 100644 --- a/preprocess/preprocess_phoenix.cpp +++ b/preprocess/preprocess_phoenix.cpp @@ -3,14 +3,14 @@ // 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 -#include -#include +#include "../include/boost/phoenix/version.hpp" +#include "../include/boost/phoenix/core.hpp" +#include "../include/boost/phoenix/bind.hpp" +#include "../include/boost/phoenix/function.hpp" +#include "../include/boost/phoenix/fusion.hpp" +#include "../include/boost/phoenix/object.hpp" +#include "../include/boost/phoenix/operator.hpp" +#include "../include/boost/phoenix/scope.hpp" +#include "../include/boost/phoenix/scope/dynamic.hpp" +#include "../include/boost/phoenix/statement.hpp" +#include "../include/boost/phoenix/stl.hpp" diff --git a/preprocess/wave-msvc-10.0.cfg b/preprocess/wave-msvc-10.0.cfg index e938e4d..dd63971 100644 --- a/preprocess/wave-msvc-10.0.cfg +++ b/preprocess/wave-msvc-10.0.cfg @@ -1,5 +1,6 @@ -DBOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES -DBOOST_PHOENIX_CREATE_PREPROCESSED_FILES +-S../include -S../../.. -S"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" -S. diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg index 902d265..c4a13d8 100644 --- a/preprocess/wave.cfg +++ b/preprocess/wave.cfg @@ -1,8 +1,7 @@ -DBOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES -DBOOST_PHOENIX_CREATE_PREPROCESSED_FILES --S/home/thomas/programming/boost/trunk --S/home/heller/programming/boost/trunk --S/home/cip/ce/sithhell/programming/boost +-S../include +-S../../.. -S/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.0/include -S/usr/lib/gcc/x86_64-unknown-linux-gnu/4.6.1/include -S/usr/lib/gcc/i486-linux-gnu/4.4.5/include From 1d6fb158c14ffa3130318cff05a9127c156e7107 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Wed, 22 Jan 2014 23:30:28 +0000 Subject: [PATCH 04/29] fix for bug 9111 --- include/boost/phoenix/bind/detail/function_ptr.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/phoenix/bind/detail/function_ptr.hpp b/include/boost/phoenix/bind/detail/function_ptr.hpp index 6ede485..d947f63 100644 --- a/include/boost/phoenix/bind/detail/function_ptr.hpp +++ b/include/boost/phoenix/bind/detail/function_ptr.hpp @@ -38,7 +38,7 @@ namespace boost { namespace phoenix { namespace detail } template - bool operator==(function_ptr const & rhs) const + bool operator==(function_ptr const & /*rhs*/) const { return false; } From fe7e28de52c4269d8a09a1c26a35c3634b913ffb Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 00:02:32 +0000 Subject: [PATCH 05/29] Fixes for bug 9113 --- include/boost/phoenix/core/visit_each.hpp | 2 +- include/boost/phoenix/function/function.hpp | 4 ++-- include/boost/phoenix/statement/do_while.hpp | 4 ++-- include/boost/phoenix/statement/for.hpp | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/boost/phoenix/core/visit_each.hpp b/include/boost/phoenix/core/visit_each.hpp index ad4ca14..9a8971e 100644 --- a/include/boost/phoenix/core/visit_each.hpp +++ b/include/boost/phoenix/core/visit_each.hpp @@ -22,7 +22,7 @@ namespace boost { namespace phoenix struct visit_each_impl { Visitor& visitor; - visit_each_impl(Visitor& visitor ) : visitor(visitor) {} + visit_each_impl(Visitor& visitor_ ) : visitor(visitor_) {} template void operator()(T const& t) const diff --git a/include/boost/phoenix/function/function.hpp b/include/boost/phoenix/function/function.hpp index 20d58aa..4817100 100644 --- a/include/boost/phoenix/function/function.hpp +++ b/include/boost/phoenix/function/function.hpp @@ -37,8 +37,8 @@ namespace boost { namespace phoenix : f() {} - BOOST_CONSTEXPR function(F f) - : f(f) + BOOST_CONSTEXPR function(F f_) + : f(f_) {} template diff --git a/include/boost/phoenix/statement/do_while.hpp b/include/boost/phoenix/statement/do_while.hpp index d9b5361..ff0a297 100644 --- a/include/boost/phoenix/statement/do_while.hpp +++ b/include/boost/phoenix/statement/do_while.hpp @@ -43,8 +43,8 @@ namespace boost { namespace phoenix template struct do_while_gen { - do_while_gen(Do const& do_) - : do_(do_) {} + do_while_gen(Do const& do_it) + : do_(do_it) {} template typename expression::do_while::type const diff --git a/include/boost/phoenix/statement/for.hpp b/include/boost/phoenix/statement/for.hpp index e98a1dc..ad4670e 100644 --- a/include/boost/phoenix/statement/for.hpp +++ b/include/boost/phoenix/statement/for.hpp @@ -56,17 +56,17 @@ namespace boost { namespace phoenix template struct for_gen { - for_gen(Init const& init, Cond const& cond, Step const& step) - : init(init), cond(cond), step(step) {} + for_gen(Init const& init_, Cond const& cond_, Step const& step_) + : init(init_), cond(cond_), step(step_) {} template typename expression::for_::type const - operator[](Do const& do_) const + operator[](Do const& do_it) const { return expression:: for_:: - make(init, cond, step, do_); + make(init, cond, step, do_it); } Init init; From a6d72b52fc80fbae187ed223d89b2cf1d5ded6ae Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 09:27:17 +0000 Subject: [PATCH 06/29] Delete test bug000008 - relates to boost/spirit and not phoenix V3. --- test/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile b/test/Jamfile index 70f0bd7..9535585 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -85,7 +85,7 @@ test-suite phoenix_scope : [ run scope/let_tests.cpp ] [ run scope/dynamic_tests.cpp ] [ run scope/bug3289.cpp ] - [ run scope/bug_000008.cpp : : : $(multi-threading) ] +# [ run scope/bug_000008.cpp : : : $(multi-threading) ] ; test-suite phoenix_algorithm : From cae509759586b8beb831353b56a0dac215648ada Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 10:57:21 +0000 Subject: [PATCH 07/29] Further fixes for 9113 --- include/boost/phoenix/statement/if.hpp | 10 +++++----- include/boost/phoenix/statement/switch.hpp | 2 +- include/boost/phoenix/statement/try_catch.hpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/phoenix/statement/if.hpp b/include/boost/phoenix/statement/if.hpp index e9e9334..41badc9 100644 --- a/include/boost/phoenix/statement/if.hpp +++ b/include/boost/phoenix/statement/if.hpp @@ -93,9 +93,9 @@ namespace boost { namespace phoenix template struct else_gen { - else_gen(Cond const & cond, Then const & then) - : cond(cond) - , then(then) {} + else_gen(Cond const & cond_, Then const & then_) + : cond(cond_) + , then(then_) {} template typename expression::if_else_statement::type const @@ -135,8 +135,8 @@ namespace boost { namespace phoenix template struct if_gen { - if_gen(Cond const & cond) - : cond(cond) {} + if_gen(Cond const & cond_) + : cond(cond_) {} template typename expression::if_::type const diff --git a/include/boost/phoenix/statement/switch.hpp b/include/boost/phoenix/statement/switch.hpp index d101c03..20a53e7 100644 --- a/include/boost/phoenix/statement/switch.hpp +++ b/include/boost/phoenix/statement/switch.hpp @@ -238,7 +238,7 @@ namespace boost { namespace phoenix { template struct switch_gen { - switch_gen(Cond const& cond) : cond(cond) {} + switch_gen(Cond const& cond_) : cond(cond_) {} template typename expression::switch_< diff --git a/include/boost/phoenix/statement/try_catch.hpp b/include/boost/phoenix/statement/try_catch.hpp index d3e40cf..a7ea8bf 100644 --- a/include/boost/phoenix/statement/try_catch.hpp +++ b/include/boost/phoenix/statement/try_catch.hpp @@ -274,7 +274,7 @@ namespace boost { namespace phoenix template struct catch_gen { - catch_gen(TryCatch const& try_catch) : try_catch(try_catch) {} + catch_gen(TryCatch const& try_catch_) : try_catch(try_catch_) {} template typename boost::disable_if< @@ -301,7 +301,7 @@ namespace boost { namespace phoenix template struct catch_all_gen { - catch_all_gen(TryCatch const& try_catch) : try_catch(try_catch) {} + catch_all_gen(TryCatch const& try_catch_) : try_catch(try_catch_) {} template typename boost::disable_if< From 97a6a32cb9015b9931a5b1280cb1be9843e88b7c Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 12:39:52 +0000 Subject: [PATCH 08/29] Apply patch to fix 7181 --- include/boost/phoenix/core/actor.hpp | 2 ++ include/boost/phoenix/support/vector.hpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/boost/phoenix/core/actor.hpp b/include/boost/phoenix/core/actor.hpp index f2b47de..9a8d7eb 100644 --- a/include/boost/phoenix/core/actor.hpp +++ b/include/boost/phoenix/core/actor.hpp @@ -29,6 +29,8 @@ #ifdef BOOST_MSVC #pragma warning(push) #pragma warning(disable: 4522) // 'this' used in base member initializer list +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required #endif namespace boost { namespace phoenix diff --git a/include/boost/phoenix/support/vector.hpp b/include/boost/phoenix/support/vector.hpp index 82ec6af..6899d85 100644 --- a/include/boost/phoenix/support/vector.hpp +++ b/include/boost/phoenix/support/vector.hpp @@ -1,3 +1,9 @@ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4512) // assignment operator could not be generated +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required +#endif #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES) #ifndef BOOST_PHOENIX_SUPPORT_VECTOR_HPP @@ -132,3 +138,7 @@ BOOST_FUSION_ADAPT_TPL_STRUCT_NO_PARTIAL( #endif #endif + +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif From 8a3e20ad4c12d42c2d9ac243a6766e6e322728de Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 17:22:23 +0000 Subject: [PATCH 09/29] test/jamfile Reinstate bug_000008 --- test/Jamfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile b/test/Jamfile index 9535585..70f0bd7 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -85,7 +85,7 @@ test-suite phoenix_scope : [ run scope/let_tests.cpp ] [ run scope/dynamic_tests.cpp ] [ run scope/bug3289.cpp ] -# [ run scope/bug_000008.cpp : : : $(multi-threading) ] + [ run scope/bug_000008.cpp : : : $(multi-threading) ] ; test-suite phoenix_algorithm : From 7423dcd8b3cfa96d0e46a5f9c2b9719f33963f6a Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 17:23:10 +0000 Subject: [PATCH 10/29] test/scope/bug_000008.cpp Altered to use Phoenix --- test/scope/bug_000008.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/scope/bug_000008.cpp b/test/scope/bug_000008.cpp index cd524d1..d5820b6 100644 --- a/test/scope/bug_000008.cpp +++ b/test/scope/bug_000008.cpp @@ -11,11 +11,13 @@ // for a description of the bug being tested for by this program // // This code is borrowed from Spirit's bug_000008.cpp test for multithreads. + // Now modified to point to the Phoenix headers + // instead of the ones in Spirit. #include #include #include #include -#include +#include #if defined(DONT_HAVE_BOOST) \ || !defined(BOOST_HAS_THREADS) \ @@ -42,8 +44,8 @@ main() #else // the real MT stuff -#include -#include +#include +#include #include static const int number_of_calls_per_thread=20000; From 64f483db39f033cdc8608e8d8781e493bbb696ee Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 17:31:53 +0000 Subject: [PATCH 11/29] test/scope/bug_000008.cpp Modified file now runs with gcc 4.6 --- test/scope/bug_000008.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/scope/bug_000008.cpp b/test/scope/bug_000008.cpp index d5820b6..de39398 100644 --- a/test/scope/bug_000008.cpp +++ b/test/scope/bug_000008.cpp @@ -52,7 +52,8 @@ static const int number_of_calls_per_thread=20000; struct test_dynamic : boost::phoenix::dynamic { - test_dynamic() : b(*this) {} + // test_dynamic() : b(*this) {} + test_dynamic() : b(init<0>(this)) {} member1 b; }; From a7d6cc20eb770bc6fa674bbcbe796b53cb639e6a Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 21:56:34 +0000 Subject: [PATCH 12/29] include/boost/phoenix/operator/comparison.hpp Fix for 6268 --- include/boost/phoenix/operator/comparison.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/boost/phoenix/operator/comparison.hpp b/include/boost/phoenix/operator/comparison.hpp index 987c5a7..bea292f 100644 --- a/include/boost/phoenix/operator/comparison.hpp +++ b/include/boost/phoenix/operator/comparison.hpp @@ -11,6 +11,7 @@ #include #include #include +#include // Added to solve bug 6268 namespace boost { namespace phoenix { From 108f16f1de86f43332b30147cfb862b16d0a946b Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 23 Jan 2014 21:59:01 +0000 Subject: [PATCH 13/29] Test for bug6268 --- test/Jamfile | 1 + test/regression/bug6268.cpp | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 test/regression/bug6268.cpp diff --git a/test/Jamfile b/test/Jamfile index 70f0bd7..95fb322 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -126,6 +126,7 @@ test-suite phoenix_regression : [ run regression/bug5626.cpp ] [ run regression/bug5968.cpp ] [ run regression/bug6040.cpp ] + [ run regression/bug6268.cpp ] ; test-suite phoenix_include : diff --git a/test/regression/bug6268.cpp b/test/regression/bug6268.cpp new file mode 100644 index 0000000..7bfc3f9 --- /dev/null +++ b/test/regression/bug6268.cpp @@ -0,0 +1,20 @@ +#include +#include +#include +#include + +struct foo : boost::fusion::sequence_facade +{ + // Rest of the sequence_facade extension mechanism code omitted, + // as it is not needed to reproduce the error + + foo() : x(), y() {} + + int x; + int y; +}; + +int main() +{ + /*auto x = */ boost::phoenix::arg_names::arg1 < foo(); +} From 7924230920572b4e9bdcd46ffa52692215c7008c Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 12:20:43 +0000 Subject: [PATCH 14/29] include/boost/phoenix/core/value.hpp remove tabs --- include/boost/phoenix/core/value.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/phoenix/core/value.hpp b/include/boost/phoenix/core/value.hpp index 5ffa98d..6c46242 100644 --- a/include/boost/phoenix/core/value.hpp +++ b/include/boost/phoenix/core/value.hpp @@ -56,11 +56,11 @@ namespace boost { namespace phoenix template struct result : boost::remove_const< - typename boost::remove_reference< + typename boost::remove_reference< typename evaluator::impl::result_type - >::type - > - {}; + >::type + > + {}; template typename result const &, Context &)>::type From 71ed60768888c994d78a87ef06d8478d0ece4788 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 12:27:19 +0000 Subject: [PATCH 15/29] include/boost/phoenix/scope/lambda remove tabs --- include/boost/phoenix/scope/lambda.hpp | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/boost/phoenix/scope/lambda.hpp b/include/boost/phoenix/scope/lambda.hpp index 432edd9..0162fe7 100644 --- a/include/boost/phoenix/scope/lambda.hpp +++ b/include/boost/phoenix/scope/lambda.hpp @@ -96,22 +96,22 @@ namespace boost { namespace phoenix >::type env_type; - typedef - typename result_of::eval< - Lambda - , typename result_of::context< - scoped_environment< - env_type - , outer_env_type - , locals_type - , map_type - > - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + Lambda + , typename result_of::context< + scoped_environment< + env_type + , outer_env_type + , locals_type + , map_type + > + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template @@ -148,7 +148,7 @@ namespace boost { namespace phoenix >::type env_type; - scoped_environment< + scoped_environment< env_type , outer_env_type , locals_type From 26b1d87cd48d6fad667d3b403831571332e6b508 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 12:53:58 +0000 Subject: [PATCH 16/29] Removed tabs from files --- .../phoenix/scope/scoped_environment.hpp | 8 +- include/boost/phoenix/scope/this.hpp | 190 +++++++++--------- 2 files changed, 99 insertions(+), 99 deletions(-) diff --git a/include/boost/phoenix/scope/scoped_environment.hpp b/include/boost/phoenix/scope/scoped_environment.hpp index a53b4e5..94e5bd3 100644 --- a/include/boost/phoenix/scope/scoped_environment.hpp +++ b/include/boost/phoenix/scope/scoped_environment.hpp @@ -44,11 +44,11 @@ namespace boost { namespace phoenix , locals(locals) {} - scoped_environment(scoped_environment const & o) - : env(o.env) + scoped_environment(scoped_environment const & o) + : env(o.env) , outer_env(o.outer_env) - , locals(o.locals) - {}; + , locals(o.locals) + {}; Env const & env; OuterEnv const & outer_env; diff --git a/include/boost/phoenix/scope/this.hpp b/include/boost/phoenix/scope/this.hpp index de50e80..ebc0888 100644 --- a/include/boost/phoenix/scope/this.hpp +++ b/include/boost/phoenix/scope/this.hpp @@ -62,56 +62,56 @@ namespace boost { namespace phoenix { template struct result { - typedef - typename proto::detail::uncvref< - typename result_of::env< - Context - >::type - >::type - outer_env_type; - - typedef - typename remove_pointer< - typename remove_reference< - typename fusion::result_of::at_c< - outer_env_type - , 0 - >::type - >::type - >::type - actor_type; - - typedef - typename result_of::eval< - A0 const & - , Context const & - >::type - a0_type; + typedef + typename proto::detail::uncvref< + typename result_of::env< + Context + >::type + >::type + outer_env_type; - typedef - vector2 - inner_env_type; + typedef + typename remove_pointer< + typename remove_reference< + typename fusion::result_of::at_c< + outer_env_type + , 0 + >::type + >::type + >::type + actor_type; - typedef - scoped_environment< - inner_env_type - , outer_env_type - , vector0<> - , detail::map_local_index_to_tuple<> - > - env_type; - - typedef - typename result_of::eval< - actor_type const & - , typename result_of::context< - inner_env_type - , typename result_of::actions< - Context - >::type - >::type - >::type - type; + typedef + typename result_of::eval< + A0 const & + , Context const & + >::type + a0_type; + + typedef + vector2 + inner_env_type; + + typedef + scoped_environment< + inner_env_type + , outer_env_type + , vector0<> + , detail::map_local_index_to_tuple<> + > + env_type; + + typedef + typename result_of::eval< + actor_type const & + , typename result_of::context< + inner_env_type + , typename result_of::actions< + Context + >::type + >::type + >::type + type; }; template @@ -121,50 +121,50 @@ namespace boost { namespace phoenix { //std::cout << typeid(checker).name() << "\n"; //std::cout << typeid(checker).name() << "\n"; - typedef - typename proto::detail::uncvref< - typename result_of::env< - Context - >::type - >::type - outer_env_type; - - typedef - typename remove_pointer< - typename remove_reference< - typename fusion::result_of::at_c< - outer_env_type - , 0 - >::type - >::type - >::type - actor_type; - - typedef - typename result_of::eval< - A0 const & - , Context const & - >::type - a0_type; + typedef + typename proto::detail::uncvref< + typename result_of::env< + Context + >::type + >::type + outer_env_type; - typedef - vector2 - inner_env_type; + typedef + typename remove_pointer< + typename remove_reference< + typename fusion::result_of::at_c< + outer_env_type + , 0 + >::type + >::type + >::type + actor_type; - typedef - scoped_environment< - inner_env_type - , outer_env_type - , vector0<> - , detail::map_local_index_to_tuple<> - > - env_type; + typedef + typename result_of::eval< + A0 const & + , Context const & + >::type + a0_type; - inner_env_type inner_env = {fusion::at_c<0>(phoenix::env(ctx)), phoenix::eval(a0, ctx)}; - vector0<> locals; - env_type env(inner_env, phoenix::env(ctx), locals); + typedef + vector2 + inner_env_type; - return phoenix::eval(*fusion::at_c<0>(phoenix::env(ctx)), phoenix::context(inner_env, phoenix::actions(ctx))); + typedef + scoped_environment< + inner_env_type + , outer_env_type + , vector0<> + , detail::map_local_index_to_tuple<> + > + env_type; + + inner_env_type inner_env = {fusion::at_c<0>(phoenix::env(ctx)), phoenix::eval(a0, ctx)}; + vector0<> locals; + env_type env(inner_env, phoenix::env(ctx), locals); + + return phoenix::eval(*fusion::at_c<0>(phoenix::env(ctx)), phoenix::context(inner_env, phoenix::actions(ctx))); //return (*fusion::at_c<0>(phoenix::env(ctx)))(eval(a0, ctx)); } }; @@ -174,17 +174,17 @@ namespace boost { namespace phoenix { : call {}; - template + template struct is_nullary::when : proto::make {}; - template - typename expression::this_::type const - this_(A0 const & a0) - { - return expression::this_::make(a0); - } + template + typename expression::this_::type const + this_(A0 const & a0) + { + return expression::this_::make(a0); + } }} From f61a013cb80c5905de3e328a381e0a6e8babf582 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:05:32 +0000 Subject: [PATCH 17/29] Licences and tabs in example files --- example/generator.cpp | 2 +- example/generator2.cpp | 46 +++++++++++++++++++--------------- example/identity_transform.cpp | 6 +++++ example/parallel_for.cpp | 6 +++++ 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/example/generator.cpp b/example/generator.cpp index 60e3d27..e312068 100644 --- a/example/generator.cpp +++ b/example/generator.cpp @@ -1,7 +1,7 @@ /*============================================================================= Copyright (c) 2011 Thomas Heller - Distributed under the Boost Software License, Version 1.0. (See accompanying + 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) ==============================================================================*/ diff --git a/example/generator2.cpp b/example/generator2.cpp index 3691351..aef2f98 100644 --- a/example/generator2.cpp +++ b/example/generator2.cpp @@ -1,3 +1,9 @@ +/*============================================================================= + Copyright (c) 2011 Thomas Heller + + 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 @@ -7,26 +13,26 @@ int main() { - using boost::phoenix::lambda; - using boost::phoenix::let; - using boost::phoenix::ref; - using boost::phoenix::construct; - using boost::phoenix::local_names::_a; - using boost::phoenix::arg_names::_1; + using boost::phoenix::lambda; + using boost::phoenix::let; + using boost::phoenix::ref; + using boost::phoenix::construct; + using boost::phoenix::local_names::_a; + using boost::phoenix::arg_names::_1; - BOOST_AUTO( - generator - , (lambda - ( - _a = val(_1) - ) - [ - std::cout << _a << " " - , _a++ - ]) - ); + BOOST_AUTO( + generator + , (lambda + ( + _a = val(_1) + ) + [ + std::cout << _a << " " + , _a++ + ] ) + ); - int i = 0; - std::vector v(10); - std::for_each(v.begin(), v.end(), generator(0)); + int i = 0; + std::vector v(10); + std::for_each(v.begin(), v.end(), generator(0)); } diff --git a/example/identity_transform.cpp b/example/identity_transform.cpp index 2950dec..471bec0 100644 --- a/example/identity_transform.cpp +++ b/example/identity_transform.cpp @@ -1,3 +1,9 @@ +/*============================================================================= + Copyright (c) 2001-2007 Joel de Guzman + + 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 diff --git a/example/parallel_for.cpp b/example/parallel_for.cpp index e021df0..1fc11d1 100644 --- a/example/parallel_for.cpp +++ b/example/parallel_for.cpp @@ -1,3 +1,9 @@ +/*============================================================================= + Copyright (c) 2001-2007 Joel de Guzman + + 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 From d9bd12e239bf06a324f25e8a550f54e92aff881f Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:17:05 +0000 Subject: [PATCH 18/29] delete empty file test/include/bind/bind.cpp --- test/include/bind/bind.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/include/bind/bind.cpp diff --git a/test/include/bind/bind.cpp b/test/include/bind/bind.cpp deleted file mode 100644 index e69de29..0000000 From 4bf78093303ca7069f068f73f0be51e5d41b7ec7 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:17:33 +0000 Subject: [PATCH 19/29] test/bind/bug5782.cpp Add copyright --- test/bind/bug5782.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/bind/bug5782.cpp b/test/bind/bug5782.cpp index e07b526..37b38c9 100644 --- a/test/bind/bug5782.cpp +++ b/test/bind/bug5782.cpp @@ -1,3 +1,9 @@ +/*============================================================================= + Copyright (c) 2001-2007 Joel de Guzman + + 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 From 64a02259ef71407e0ebc832781e3e094e4ff2083 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:17:59 +0000 Subject: [PATCH 20/29] test/Jamfile add two include/bind tests --- test/Jamfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Jamfile b/test/Jamfile index 95fb322..8bc973b 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -140,6 +140,8 @@ test-suite phoenix_include : [ run include/statement.cpp ] [ run include/stl.cpp ] [ run include/version.cpp ] + [ run include/bind/bind_member_function.cpp] + [ run include/bind/bind_member_variable.cpp] [ run include/core/actor.cpp ] [ run include/core/argument.cpp ] [ run include/core/arity.cpp ] From 66377a9761a59999269ed7f4f00fcf8ba21a34a4 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:24:53 +0000 Subject: [PATCH 21/29] Delete empty files --- test/include/core/test.cpp | 0 test/include/operator/operator.cpp | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/include/core/test.cpp delete mode 100644 test/include/operator/operator.cpp diff --git a/test/include/core/test.cpp b/test/include/core/test.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/test/include/operator/operator.cpp b/test/include/operator/operator.cpp deleted file mode 100644 index e69de29..0000000 From e828a7fc5c9cb535870ede99d96fc11b40ea6b0f Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:25:13 +0000 Subject: [PATCH 22/29] test/Jamfile Sort out order in file --- test/Jamfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 8bc973b..61b769e 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -151,13 +151,13 @@ test-suite phoenix_include : [ run include/core/function_equal.cpp ] [ run include/core/is_actor.cpp ] [ run include/core/is_nullary.cpp ] - [ run include/core/nothing.cpp ] - [ run include/core/meta_grammar.cpp ] [ run include/core/limits.cpp ] + [ run include/core/meta_grammar.cpp ] + [ run include/core/nothing.cpp ] + [ run include/core/reference.cpp ] [ run include/core/terminal.cpp ] [ run include/core/value.cpp ] [ run include/core/visit_each.cpp ] - [ run include/core/reference.cpp ] [ run include/function/function.cpp : : : : function_function ] [ run include/fusion/at.cpp ] [ run include/object/const_cast.cpp ] From 8ace2fa27a94d4e6a57cadf0f4a2374ca69bb038 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 13:25:33 +0000 Subject: [PATCH 23/29] Copyright in bug files --- test/regression/bug5626.cpp | 7 +++++++ test/regression/bug5968.cpp | 7 +++++++ test/regression/bug6040.cpp | 8 ++++++++ 3 files changed, 22 insertions(+) diff --git a/test/regression/bug5626.cpp b/test/regression/bug5626.cpp index 2a6d39e..83d731b 100644 --- a/test/regression/bug5626.cpp +++ b/test/regression/bug5626.cpp @@ -1,3 +1,10 @@ +/*============================================================================== + Copyright (c) 2005-2010 Joel de Guzman + Copyright (c) 2010 Thomas Heller + + 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 diff --git a/test/regression/bug5968.cpp b/test/regression/bug5968.cpp index 403c945..113360a 100644 --- a/test/regression/bug5968.cpp +++ b/test/regression/bug5968.cpp @@ -1,3 +1,10 @@ +/*============================================================================== + Copyright (c) 2005-2010 Joel de Guzman + Copyright (c) 2010 Thomas Heller + + 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 diff --git a/test/regression/bug6040.cpp b/test/regression/bug6040.cpp index 041dea3..dce413c 100644 --- a/test/regression/bug6040.cpp +++ b/test/regression/bug6040.cpp @@ -1,3 +1,11 @@ +/*============================================================================== + Copyright (c) 2005-2010 Joel de Guzman + Copyright (c) 2010 Thomas Heller + + 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 From 22d4dfb8434d98827828c5d2c438fc1e715dd433 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 14:17:46 +0000 Subject: [PATCH 24/29] Tabs taken out of test files. --- test/scope/lambda_tests.cpp | 8 ++++---- test/scope/this.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/test/scope/lambda_tests.cpp b/test/scope/lambda_tests.cpp index f77af2a..294d91f 100644 --- a/test/scope/lambda_tests.cpp +++ b/test/scope/lambda_tests.cpp @@ -184,16 +184,16 @@ main() } { - { + { // $$$ Fixme. This should not be failing $$$ //int x = (let(_a = lambda[val(1)])[_a])()(); //BOOST_TEST(x == 1); - } + } - { + { int x = (let(_a = lambda[val(1)])[bind(_a)])(); BOOST_TEST(x == 1); - } + } } { diff --git a/test/scope/this.cpp b/test/scope/this.cpp index 4695453..2f9ae57 100644 --- a/test/scope/this.cpp +++ b/test/scope/this.cpp @@ -59,20 +59,20 @@ int main() std::cout << _1 << " " , this_(_1 - 1) ] - , val(0) + , val(0) )); - /* - f(( - if_else( +/* + f(( + if_else( _1 == 0 , _1 ,this_(_1 - 1) ) )); - */ - - f(( +*/ + + f(( if_else( _1 != 0 ,this_(_1 - 1) @@ -120,5 +120,5 @@ int main() ) ) )); - */ +*/ } From 9f0a70e4576147e3f2be8df51f841eb54e04a41a Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 14:31:18 +0000 Subject: [PATCH 25/29] test/Jamfile correct file - all tests now pass --- test/Jamfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 61b769e..0e2805f 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -140,8 +140,8 @@ test-suite phoenix_include : [ run include/statement.cpp ] [ run include/stl.cpp ] [ run include/version.cpp ] - [ run include/bind/bind_member_function.cpp] - [ run include/bind/bind_member_variable.cpp] + [ run include/bind/bind_member_function.cpp ] + [ run include/bind/bind_member_variable.cpp ] [ run include/core/actor.cpp ] [ run include/core/argument.cpp ] [ run include/core/arity.cpp ] From a12b8c31554324b31e19eda9d3342028d7f98a71 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Fri, 24 Jan 2014 16:48:15 +0000 Subject: [PATCH 26/29] test/stdlib/cmath.cpp Added copyright --- test/stdlib/cmath.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/stdlib/cmath.cpp b/test/stdlib/cmath.cpp index 40dcf49..8ee3a5d 100644 --- a/test/stdlib/cmath.cpp +++ b/test/stdlib/cmath.cpp @@ -1,3 +1,10 @@ +/*============================================================================= + Copyright (c) 2001-2007 Joel de Guzman + + 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 From cadcf3bd3bfea17db3127609e490219e45682ff5 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Sat, 25 Jan 2014 23:39:18 +0000 Subject: [PATCH 27/29] include/boost/phoenix/core/detail/phx2_result.hpp Change check to check_ to avoid Mac macro --- include/boost/phoenix/core/detail/phx2_result.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/phoenix/core/detail/phx2_result.hpp b/include/boost/phoenix/core/detail/phx2_result.hpp index 76babd2..3f7f485 100644 --- a/include/boost/phoenix/core/detail/phx2_result.hpp +++ b/include/boost/phoenix/core/detail/phx2_result.hpp @@ -23,13 +23,13 @@ namespace boost { namespace phoenix { typedef char (&no)[2]; template - static yes check(typename A::type *); + static yes check_(typename A::type *); template - static no check(...); + static no check_(...); - static bool const value = (sizeof(yes) == sizeof(check(0))); + static bool const value = (sizeof(yes) == sizeof(check_(0))); typedef boost::mpl::bool_ type; }; From 7f0f3a1b4edf3c4878b7920a4c85b76ff5ba54e5 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Sun, 26 Jan 2014 09:07:12 +0000 Subject: [PATCH 28/29] ChangeLog New file --- ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..32487d4 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,48 @@ +Boost Phoenix: A Standard compliant C++ preprocessor library +http://www.boost.org/ + +Copyright (c) 2005-2010 Joel de Guzman +Copyright (c) 2010-2013 Thomas Heller +Copyright (c) 2014 John Fletcher + +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) + +------------------------------------------------------------------------------- + +TODO (known issues): +- Create a full list of known issues. +- Inspection report outstanding issues + Fix copyright and licence in preprocessed files for function_equal + Fix libs/phoenix/doc/html/boostbook.css: Unlinked File +- Investigate fixes needed for the following bugs +(all refer to phoenix though not all may be in fact phoenix bugs) +#9295, #9291, #9260, #8820, #8800, #8774, #8704 +#8564, #8558, #8504, #8298, #8187, #8156, #7996 +#7953, #7946, #7730, #7633, #7481, #7480, #7423 +#7391, #7356, #7166, #7165, #6911, #6848, #6665 +#6202, #6133, #6026, #5875, #5824, #5715, #5687 +- Complete work on the following under investigation +#9363, #9362, #7624, #7199 +- #9113 warnings on -Wshadow - find and fix remaining warnings +------------------------------------------------------------------------------- + +CHANGELOG + +- V3.0.1 +- Started CHANGELOG +- Fixed bug_000008 to use phoenix headers correctly. + This fixes it for most systems but not for + Clang Linux C++11 with libstdc++ where the problem seems + to be in boost/thread. Clang Linux C++11 with libc++ works. +- Fixed #9113 warnings on -Wshadow (some fixed) +- Fixed #9111 unused parameter warning in phoenix bind +- Fixed #8417 Minor documentation +- Fixed #7181 MSVC warnings +- Fixed #6268 phoenix and fusion operator < and added test bug6268 +- Fixed many issues from Inspection report + phoenix/core/detail/phx_result.hpp Fixed clash with Apple macro 'check' + +Boost V1.55: +- V3.0.0 + From 1bd3bce7d3ed8d9896b5762455cfeaa77f710a35 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Sun, 26 Jan 2014 09:09:38 +0000 Subject: [PATCH 29/29] phoenix/version.hpp Change version to 3.0.1 --- include/boost/phoenix/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/phoenix/version.hpp b/include/boost/phoenix/version.hpp index 9b3fd04..f639cd3 100644 --- a/include/boost/phoenix/version.hpp +++ b/include/boost/phoenix/version.hpp @@ -13,6 +13,6 @@ // This is the version of the library // /////////////////////////////////////////////////////////////////////////////// -#define BOOST_PHOENIX_VERSION 0x3000 // 3.0.0 +#define BOOST_PHOENIX_VERSION 0x3001 // 3.0.1 #endif