- Forgot some changes for bug #5920

- Added testcase for bug #5968, works on gcc 4.6



[SVN r74833]

include/boost/phoenix/operator.hpp

@@ -12,7 +12,7 @@
 #include <boost/phoenix/version.hpp>
 #include <boost/phoenix/operator/arithmetic.hpp>
 #include <boost/phoenix/operator/bitwise.hpp>
-#include <boost/phoenix/operator/comparision.hpp>
+#include <boost/phoenix/operator/comparison.hpp>
 #include <boost/phoenix/operator/if_else.hpp>
 #include <boost/phoenix/operator/self.hpp>
 #include <boost/phoenix/operator/logical.hpp>

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 ]

test/include/operator/comparision.cpp → 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 <boost/phoenix/operator/comparision.hpp>
+#include <boost/phoenix/operator/comparison.hpp>
 int main() {}

test/regression/bug5968.cpp

@@ -0,0 +1,20 @@
+
+#include <boost/phoenix.hpp>
+#include <boost/signals2.hpp>
+
+struct s
+{
+        bool f(int, bool) { return true; }
+};
+
+int main()
+{
+        s s_obj;
+        boost::signals2::signal<bool (int, bool)> sig;
+        sig.connect(
+                boost::phoenix::bind(
+                        &s::f, &s_obj,
+                        boost::phoenix::placeholders::arg1,
+                        boost::phoenix::placeholders::arg2));
+}
+