re PR libstdc++/80034 (unqualified calls to std::distance in std::list::sort)

PR libstdc++/80034
* include/bits/list.tcc (merge(list&&)): Use const for the size_t
in the catch-block.
(merge(list&&, _StrictWeakOrdering)): Likewise.
* testsuite/23_containers/list/operations/80034.cc: New.

From-SVN: r246107

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c85d6a78d568ee9ac2f90389206a7f8b2d3186fe..544d15549aa443cf80bf89904b5e5086085dd6f2 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-13  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+       PR libstdc++/80034
+       * include/bits/list.tcc (merge(list&&)): Use const for the size_t
+       in the catch-block.
+       (merge(list&&, _StrictWeakOrdering)): Likewise.
+       * testsuite/23_containers/list/operations/80034.cc: New.
+
 2017-03-13  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        Implement LWG 2806, Base class of bad_optional_access.

diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc
index 9623a139a70591077993110aed23203d62273f86..fcb8353e09f557fe985e05d5ea30c00220ef1eec 100644 (file)
--- a/libstdc++-v3/include/bits/list.tcc
+++ b/libstdc++-v3/include/bits/list.tcc
@@ -405,7 +405,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
          }
          __catch(...)
            {
-             size_t __dist = std::distance(__first2, __last2);
+             const size_t __dist = std::distance(__first2, __last2);
              this->_M_inc_size(__orig_size - __dist);
              __x._M_set_size(__dist);
              __throw_exception_again;
@@ -453,7 +453,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
              }
            __catch(...)
              {
-               size_t __dist = std::distance(__first2, __last2);
+               const size_t __dist = std::distance(__first2, __last2);
                this->_M_inc_size(__orig_size - __dist);
                __x._M_set_size(__dist);
                __throw_exception_again;

diff --git a/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc b/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc
new file mode 100644 (file)
index 0000000..5c3decd
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/list/operations/80034.cc
@@ -0,0 +1,32 @@
+// { dg-do compile }
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <list>
+
+namespace X {
+  struct Y { };
+  bool operator<(Y, Y) { return false; }
+  template<typename T>
+    void distance(T, T) { }
+}
+
+int main()
+{
+  std::list<X::Y> l;
+  l.sort();
+}