From 4e64b8eb1f5ad4cff00c72af33eaaf1c2494549c Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Sun, 9 Oct 2011 00:55:08 +0000 Subject: [PATCH] - Forgot some changes for bug #5920 - Added testcase for bug #5968, works on gcc 4.6 [SVN r74833] --- include/boost/phoenix/operator.hpp | 2 +- test/Jamfile | 3 ++- .../{comparision.cpp => comparison.cpp} | 2 +- test/regression/bug5968.cpp | 20 +++++++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) rename test/include/operator/{comparision.cpp => comparison.cpp} (88%) create mode 100644 test/regression/bug5968.cpp diff --git a/include/boost/phoenix/operator.hpp b/include/boost/phoenix/operator.hpp index 297437c..c1e2688 100644 --- a/include/boost/phoenix/operator.hpp +++ b/include/boost/phoenix/operator.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/Jamfile b/test/Jamfile index 1af84d9..5c5ba1c 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -116,6 +116,7 @@ test-suite phoenix_boost_bind_compatibility : test-suite phoenix_regression : [ run regression/bug4853.cpp ] [ run regression/bug5626.cpp ] + [ run regression/bug5968.cpp ] ; test-suite phoenix_include : @@ -156,7 +157,7 @@ test-suite phoenix_include : [ run include/object/static_cast.cpp ] [ run include/operator/arithmetic.cpp ] [ run include/operator/bitwise.cpp ] - [ run include/operator/comparision.cpp ] + [ run include/operator/comparison.cpp ] [ run include/operator/if_else.cpp ] [ run include/operator/io.cpp ] [ run include/operator/logical.cpp ] diff --git a/test/include/operator/comparision.cpp b/test/include/operator/comparison.cpp similarity index 88% rename from test/include/operator/comparision.cpp rename to test/include/operator/comparison.cpp index 8bbe10d..49912bd 100644 --- a/test/include/operator/comparision.cpp +++ b/test/include/operator/comparison.cpp @@ -3,5 +3,5 @@ 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 int main() {} diff --git a/test/regression/bug5968.cpp b/test/regression/bug5968.cpp new file mode 100644 index 0000000..403c945 --- /dev/null +++ b/test/regression/bug5968.cpp @@ -0,0 +1,20 @@ + +#include +#include + +struct s +{ + bool f(int, bool) { return true; } +}; + +int main() +{ + s s_obj; + boost::signals2::signal sig; + sig.connect( + boost::phoenix::bind( + &s::f, &s_obj, + boost::phoenix::placeholders::arg1, + boost::phoenix::placeholders::arg2)); +} +