[Boost-commit] svn:boost r74833 - in trunk: boost/phoenix libs/phoenix/test libs/phoenix/test/include/operator libs/phoenix/test/regression

Subject: [Boost-commit] svn:boost r74833 - in trunk: boost/phoenix libs/phoenix/test libs/phoenix/test/include/operator libs/phoenix/test/regression
From: thom.heller_at_[hidden]
Date: 2011-10-08 20:55:09

Author: theller
Date: 2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
New Revision: 74833
URL: http://svn.boost.org/trac/boost/changeset/74833

Log:

- Forgot some changes for bug #5920
- Added testcase for bug #5968, works on gcc 4.6

Added:
   trunk/libs/phoenix/test/include/operator/comparison.cpp
      - copied, changed from r74827, /trunk/libs/phoenix/test/include/operator/comparision.cpp
   trunk/libs/phoenix/test/regression/bug5968.cpp   (contents, props changed)
Removed:
   trunk/libs/phoenix/test/include/operator/comparision.cpp
Text files modified: 
   trunk/boost/phoenix/operator.hpp                        |     2 +-                                      
   trunk/libs/phoenix/test/Jamfile                         |     3 ++-                                     
   trunk/libs/phoenix/test/include/operator/comparison.cpp |     2 +-                                      
   3 files changed, 4 insertions(+), 3 deletions(-)

Modified: trunk/boost/phoenix/operator.hpp
==============================================================================
--- trunk/boost/phoenix/operator.hpp	(original)
+++ trunk/boost/phoenix/operator.hpp	2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
@@ -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>

Modified: trunk/libs/phoenix/test/Jamfile
==============================================================================
--- trunk/libs/phoenix/test/Jamfile	(original)
+++ trunk/libs/phoenix/test/Jamfile	2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
@@ -116,6 +116,7 @@
 test-suite phoenix_regression :
     [ run regression/bug4853.cpp ]
     [ run regression/bug5626.cpp ]
+    [ run regression/bug5968.cpp ]
     ;
 
 test-suite phoenix_include :
@@ -156,7 +157,7 @@
     [ 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 ]

Deleted: trunk/libs/phoenix/test/include/operator/comparision.cpp
==============================================================================
--- trunk/libs/phoenix/test/include/operator/comparision.cpp	2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
+++ (empty file)
@@ -1,7 +0,0 @@
-/*=============================================================================
-    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 <boost/phoenix/operator/comparision.hpp>
-int main() {}

Copied: trunk/libs/phoenix/test/include/operator/comparison.cpp (from r74827, /trunk/libs/phoenix/test/include/operator/comparision.cpp)
==============================================================================
--- /trunk/libs/phoenix/test/include/operator/comparision.cpp	(original)
+++ trunk/libs/phoenix/test/include/operator/comparison.cpp	2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
@@ -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() {}

Added: trunk/libs/phoenix/test/regression/bug5968.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/phoenix/test/regression/bug5968.cpp	2011-10-08 20:55:08 EDT (Sat, 08 Oct 2011)
@@ -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));
+}
+