Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

1 files changed, 11 insertions, 1 deletions

diff --git a/libs/phoenix/test/function/adapt_function.cpp b/libs/phoenix/test/function/adapt_function.cpp
index 8eb0bd319..77cca41d8 100644
--- a/libs/phoenix/test/function/adapt_function.cpp
+++ b/libs/phoenix/test/function/adapt_function.cpp
@@ -1,7 +1,8 @@
 /*=============================================================================
   Copyright (c) 2011 Thomas Heller
+  Copyright (c) 2015 John Fletcher
 
-  Distributed under the Boost Software License, Version 1.0. (See accompanying 
+  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 <iostream>
@@ -55,6 +56,13 @@ BOOST_PHOENIX_ADAPT_FUNCTION(
 )
 BOOST_PHOENIX_ADAPT_FUNCTION(int, plus4, impl::plus4, 4)
 
+// Test of solution to bug when using namespace
+using namespace boost::phoenix;
+
+BOOST_PHOENIX_ADAPT_FUNCTION_NULLARY(void, test2, impl::test)
+BOOST_PHOENIX_ADAPT_FUNCTION(int, negate2, impl::negate, 1)
+
+
 int
 main()
 {
@@ -65,7 +73,9 @@ main()
     int b = 256;
 
     test()();
+    test2()();
     BOOST_TEST(::negate(arg1)(a) == -a);
+    BOOST_TEST(::negate2(arg1)(a) == -a);
     BOOST_TEST(::plus(arg1, arg2)(a, b) == a+b);
     BOOST_TEST(::plus(arg1, arg2, 3)(a, b) == a+b+3);
     BOOST_TEST(plus4(arg1, arg2, 3, 4)(a, b) == a+b+3+4);