Imported Upstream version 1.51.0upstream/1.51.0

7 files changed, 16 insertions, 16 deletions

diff --git a/libs/range/test/adl_conformance.cpp b/libs/range/test/adl_conformance.cpp
index 2d7f290cfe..277c183d1c 100644
--- a/libs/range/test/adl_conformance.cpp
+++ b/libs/range/test/adl_conformance.cpp
@@ -172,9 +172,9 @@ void check_adl_conformance()
     BOOST_CHECK_EQUAL( boost_test::begin( r6 ), global_namespace );
 }
 
-#include <boost/test/included/unit_test_framework.hpp>
+#include <boost/test/included/unit_test.hpp>
 
-using boost::unit_test_framework::test_suite;
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
diff --git a/libs/range/test/algorithm_test/for_each.cpp b/libs/range/test/algorithm_test/for_each.cpp
index 2ef51bfd81..701d676c40 100644
--- a/libs/range/test/algorithm_test/for_each.cpp
+++ b/libs/range/test/algorithm_test/for_each.cpp
@@ -44,7 +44,7 @@ namespace boost
             BOOST_CHECK_EQUAL( boost::udistance(rng), result_fn.invocation_count() );
             
             fn_t result_fn2 = boost::for_each(boost::make_iterator_range(rng), fn_t(rng));
-            BOOST_CHECK_EQUAL( boost::udistance(rng), result_fn.invocation_count() );
+            BOOST_CHECK_EQUAL( boost::udistance(rng), result_fn2.invocation_count() );
 
             // Test the constant version
             const SinglePassRange& cref_rng = rng;
diff --git a/libs/range/test/begin.cpp b/libs/range/test/begin.cpp
index eb745c2b58..bbc11c1e5f 100644
--- a/libs/range/test/begin.cpp
+++ b/libs/range/test/begin.cpp
@@ -18,7 +18,7 @@
 #include <boost/range/begin.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/test/included/unit_test_framework.hpp>
+#include <boost/test/included/unit_test.hpp>
 
 namespace mock_std
 {
@@ -104,12 +104,12 @@ namespace
     }
 }
 
-using boost::unit_test_framework::test_suite;
+using boost::unit_test::test_suite;
 
-boost::unit_test_framework::test_suite*
+boost::unit_test::test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-    boost::unit_test_framework::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - begin() ADL namespace barrier" );
+    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - begin() ADL namespace barrier" );
 
     test->add( BOOST_TEST_CASE( &test_range_begin ) );
 
diff --git a/libs/range/test/compat2.cpp b/libs/range/test/compat2.cpp
index 1a5359c814..2874c04d52 100644
--- a/libs/range/test/compat2.cpp
+++ b/libs/range/test/compat2.cpp
@@ -53,9 +53,9 @@ void compat1()
     iterator_of< std::vector<int> >::type i = v.begin();
 }
 
-#include <boost/test/included/unit_test_framework.hpp> 
+#include <boost/test/included/unit_test.hpp> 
 
-using boost::unit_test_framework::test_suite;
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
diff --git a/libs/range/test/compat3.cpp b/libs/range/test/compat3.cpp
index 00987e477c..5249c589f5 100644
--- a/libs/range/test/compat3.cpp
+++ b/libs/range/test/compat3.cpp
@@ -53,9 +53,9 @@ void compat1()
     iterator_of< std::vector<int> >::type i = v.begin();
 }
 
-#include <boost/test/included/unit_test_framework.hpp> 
+#include <boost/test/included/unit_test.hpp> 
 
-using boost::unit_test_framework::test_suite;
+using boost::unit_test::test_suite;
 
 test_suite* init_unit_test_suite( int argc, char* argv[] )
 {
diff --git a/libs/range/test/end.cpp b/libs/range/test/end.cpp
index e3383c3145..3e989ffe71 100644
--- a/libs/range/test/end.cpp
+++ b/libs/range/test/end.cpp
@@ -18,7 +18,7 @@
 #include <boost/range/end.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
-#include <boost/test/included/unit_test_framework.hpp>
+#include <boost/test/included/unit_test.hpp>
 
 namespace mock_std
 {
@@ -104,12 +104,12 @@ namespace
     }
 }
 
-using boost::unit_test_framework::test_suite;
+using boost::unit_test::test_suite;
 
-boost::unit_test_framework::test_suite*
+boost::unit_test::test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-    boost::unit_test_framework::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - end() ADL namespace barrier" );
+    boost::unit_test::test_suite* test = BOOST_TEST_SUITE( "Range Test Suite - end() ADL namespace barrier" );
 
     test->add( BOOST_TEST_CASE( &test_range_end_adl_avoidance ) );
 
diff --git a/libs/range/test/extension_size.cpp b/libs/range/test/extension_size.cpp
index 856f87dca2..b6f15cdb2b 100644
--- a/libs/range/test/extension_size.cpp
+++ b/libs/range/test/extension_size.cpp
@@ -40,7 +40,7 @@ namespace boost_range_extension_size_test
         impl_t m_impl;
     };
 
-    inline boost::range_difference<std::list<int> >::type
+    inline boost::range_size<std::list<int> >::type
     range_calculate_size(const FooWithoutSize& rng)
     {
         return 2u;