[Boost-commit] svn:boost r72106 - in trunk: boost/range libs/range/test

Subject: [Boost-commit] svn:boost r72106 - in trunk: boost/range libs/range/test
From: neil_at_[hidden]
Date: 2011-05-22 17:19:54

Author: neilgroves
Date: 2011-05-22 17:19:53 EDT (Sun, 22 May 2011)
New Revision: 72106
URL: http://svn.boost.org/trac/boost/changeset/72106

Log:
[boost][range] - Ticket 5547 - Boost.Range join() ambiguous with Boost.Algorithm join() function. Put the Boost.Range join function into the boost::range namespace and brought out with 'using'
Added:
   trunk/libs/range/test/ticket_5547.cpp   (contents, props changed)
Text files modified: 
   trunk/boost/range/join.hpp       |     8 ++++++++                                
   trunk/libs/range/test/Jamfile.v2 |     1 +                                       
   2 files changed, 9 insertions(+), 0 deletions(-)

Modified: trunk/boost/range/join.hpp
==============================================================================
--- trunk/boost/range/join.hpp	(original)
+++ trunk/boost/range/join.hpp	2011-05-22 17:19:53 EDT (Sun, 22 May 2011)
@@ -36,6 +36,9 @@
 
     } // namespace range_detail
 
+namespace range
+{
+
 template<class SinglePassRange1, class SinglePassRange2>
 class joined_range
     : public range_detail::joined_type<SinglePassRange1, SinglePassRange2>::type
@@ -78,6 +81,11 @@
     return joined_range<SinglePassRange1, SinglePassRange2>(r1, r2);
 }
 
+} // namespace range
+
+using ::boost::range::joined_range;
+using ::boost::range::join;
+
 } // namespace boost
 
 #endif // include guard

Modified: trunk/libs/range/test/Jamfile.v2
==============================================================================
--- trunk/libs/range/test/Jamfile.v2	(original)
+++ trunk/libs/range/test/Jamfile.v2	2011-05-22 17:19:53 EDT (Sun, 22 May 2011)
@@ -173,6 +173,7 @@
         [ range-test sub_range ]
         [ range-test ticket_5486 ]
         [ range-test ticket_5544_terminate_irange ]
+	[ range-test ticket_5547 ]
         [ range-test ticket_5556_is_sorted_namespace ]
     ;
 

Added: trunk/libs/range/test/ticket_5547.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/range/test/ticket_5547.cpp	2011-05-22 17:19:53 EDT (Sun, 22 May 2011)
@@ -0,0 +1,42 @@
+// Boost.Range library
+//
+//  Copyright Neil Groves 2011. Use, modification and
+//  distribution is subject to 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)
+//
+//
+// For more information, see http://www.boost.org/libs/range/
+//
+#include <boost/algorithm/string/join.hpp>
+#include <boost/range/join.hpp>
+
+#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <vector>
+
+namespace boost
+{
+    namespace
+    {
+   
+        // Ticket 5547 - boost::join ambiguous with algorithm::join
+        void test_ticket_5547()
+        {
+            std::vector<int> x;
+            boost::range::join(x,x);
+        }
+    }
+}
+
+boost::unit_test::test_suite*
+init_unit_test_suite(int argc, char* argv[])
+{
+    boost::unit_test::test_suite* test
+        = BOOST_TEST_SUITE( "RangeTestSuite.ticket_5547" );
+
+    test->add( BOOST_TEST_CASE( &boost::test_ticket_5547 ) );
+
+    return test;
+}