re PR libstdc++/58357 (In C++11 std::rotate(first, middle, last) now should return...

	PR libstdc++/58357
	* include/bits/algorithmfwd.h (rotate): Move to inline namespace _V2.
	* include/bits/stl_algo.h (__rotate, rotate): Likewise.

From-SVN: r220823

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 01e22688cf975d847f5caa46cbca9c9c070ed15a..79a3bd75f244b2bbdfa6a099212fd1efe0f23560 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-19  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/58357
+       * include/bits/algorithmfwd.h (rotate): Move to inline namespace _V2.
+       * include/bits/stl_algo.h (__rotate, rotate): Likewise.
+
 2015-02-19  Hans-Peter Nilsson  <hp@axis.com>
 
        PR testsuite/65093

diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h
index 11361bb948af4296a6f40372a0ead17c7f4734b1..1dfc4ad7b158b09e24e198437452c7ea56f4fbcb 100644 (file)
--- a/libstdc++-v3/include/bits/algorithmfwd.h
+++ b/libstdc++-v3/include/bits/algorithmfwd.h
@@ -530,9 +530,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     _OIter 
     reverse_copy(_BIter, _BIter, _OIter);
 
-  template<typename _FIter>
-    _FIter
-    rotate(_FIter, _FIter, _FIter);
+  inline namespace _V2
+  {
+    template<typename _FIter>
+      _FIter
+      rotate(_FIter, _FIter, _FIter);
+  }
 
   template<typename _FIter, typename _OIter>
     _OIter 

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index c27c092c455ae5ff3b339a43bc660b5ae285c21f..53c455b16f302d1c39fbe89724dcdc9734e839cb 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -1237,6 +1237,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return __m;
     }
 
+  inline namespace _V2
+  {
+
   /// This is a helper function for the rotate algorithm.
   template<typename _ForwardIterator>
     _ForwardIterator
@@ -1438,6 +1441,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                           std::__iterator_category(__first));
     }
 
+  } // namespace _V2
+
   /**
    *  @brief Copy a sequence, rotating its elements.
    *  @ingroup mutating_algorithms