From 1623925f5d8117be466088cdf6e7c3fbe726b960 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 30 Jan 2014 22:26:18 +0000 Subject: [PATCH 1/5] include/boost/phoenix/statement/sequence.hpp Add include for boost/proto/operators.hpp --- include/boost/phoenix/statement/sequence.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/boost/phoenix/statement/sequence.hpp b/include/boost/phoenix/statement/sequence.hpp index 965d9d3..56364ae 100644 --- a/include/boost/phoenix/statement/sequence.hpp +++ b/include/boost/phoenix/statement/sequence.hpp @@ -13,6 +13,7 @@ #include #include #include +#include // Included to solve #5715 namespace boost { namespace phoenix { From 71f8e877eea07f3609910f7465eac395ad28848f Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 30 Jan 2014 22:26:45 +0000 Subject: [PATCH 2/5] test/statement/bug5715.cpp New file --- test/statement/bug5715.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 test/statement/bug5715.cpp diff --git a/test/statement/bug5715.cpp b/test/statement/bug5715.cpp new file mode 100644 index 0000000..edb76f1 --- /dev/null +++ b/test/statement/bug5715.cpp @@ -0,0 +1,22 @@ +// Check for Bug5715 + +#include +#include + + +namespace test +{ + int x = 0; + + void f() { ++x; } + void g() { --x; } + +} +int main() +{ + ( + boost::phoenix::bind(test::f), + boost::phoenix::bind(test::g) + )(); + BOOST_TEST(x == 0); +} From 7109d5232cc3d3a8163c67b93933a88803cb62f2 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 30 Jan 2014 22:41:39 +0000 Subject: [PATCH 3/5] test/Jamfile added bug5715 --- test/Jamfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 0e2805f..f4b1262 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -38,18 +38,18 @@ test-suite phoenix_operator : ; test-suite phoenix_object : - [ run object/cast_tests.cpp ] - [ run object/new_delete_tests.cpp ] + [ run object/cast_tests.cpp ] + [ run object/new_delete_tests.cpp ] ; test-suite phoenix_function : - [ run function/adapt_function.cpp ] - [ run function/function_tests.cpp ] -# [ run function/function_tests_phx2.cpp ] + [ run function/adapt_function.cpp ] + [ run function/function_tests.cpp ] +# [ run function/function_tests_phx2.cpp ] ; test-suite phoenix_bind : - [ run bind/bind_function_tests.cpp ] + [ run bind/bind_function_tests.cpp ] [ run bind/bind_function_object_tests.cpp ] # [ run bind/bind_function_object_tests_phx2.cpp ] [ run bind/bind_member_function_tests.cpp ] @@ -58,10 +58,11 @@ test-suite phoenix_bind : ; test-suite phoenix_statement : - [ run statement/if_tests.cpp ] - [ run statement/loops_tests.cpp ] - [ run statement/switch_tests.cpp ] + [ run statement/if_tests.cpp ] + [ run statement/loops_tests.cpp ] + [ run statement/switch_tests.cpp ] [ run statement/exceptions.cpp ] + [ run statement/bug5715.cpp ] ; test-suite phoenix_container : From 3d643a00d979bdcaa5ed6ae50c61cab51926dca5 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 30 Jan 2014 22:42:13 +0000 Subject: [PATCH 4/5] test/statement/bug5175.cpp Corrections --- test/statement/bug5715.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/statement/bug5715.cpp b/test/statement/bug5715.cpp index edb76f1..8849811 100644 --- a/test/statement/bug5715.cpp +++ b/test/statement/bug5715.cpp @@ -3,6 +3,7 @@ #include #include +#include namespace test { @@ -18,5 +19,5 @@ int main() boost::phoenix::bind(test::f), boost::phoenix::bind(test::g) )(); - BOOST_TEST(x == 0); + BOOST_TEST(test::x == 0); } From b1f6d585fd45344767d2803d4af09ffc697a6603 Mon Sep 17 00:00:00 2001 From: John Fletcher Date: Thu, 30 Jan 2014 22:42:47 +0000 Subject: [PATCH 5/5] ChangeLog added fix for 5715 and deleted it from TODO. --- ChangeLog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 485932d..999fb8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,7 +28,7 @@ TODO (known issues): #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 +#6202, #6133, #6026, #5875, #5824, #5687 - Complete work on the following under investigation #9363, #9362, #7624, #7199 - #9113 warnings on -Wshadow - find and fix remaining warnings @@ -36,6 +36,9 @@ TODO (known issues): CHANGELOG +- Fixed #5715 sequencing with comma does not work for boost::phoenix::bind + Added test bug5715 + - V3.0.1 - Started CHANGELOG - Fixed bug_000008 to use phoenix headers correctly.