2
0
mirror of https://github.com/boostorg/phoenix.git synced 2026-02-18 14:22:09 +00:00

Merge branch 'fix5715' into develop

This commit is contained in:
John Fletcher
2014-01-30 22:45:03 +00:00
4 changed files with 38 additions and 10 deletions

View File

@@ -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.

View File

@@ -13,6 +13,7 @@
#include <boost/phoenix/core/limits.hpp>
#include <boost/phoenix/core/expression.hpp>
#include <boost/phoenix/core/meta_grammar.hpp>
#include <boost/proto/operators.hpp> // Included to solve #5715
namespace boost { namespace phoenix
{

View File

@@ -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 :

View File

@@ -0,0 +1,23 @@
// Check for Bug5715
#include <boost/phoenix/statement/sequence.hpp>
#include <boost/phoenix/bind.hpp>
#include <boost/detail/lightweight_test.hpp>
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(test::x == 0);
}