re PR libstdc++/19535 (Wrong return types for __pair_get<1>)

2005-01-19  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/19535
	* include/tr1/utility (struct __pair_get<1>::__get, __const_get):
	Fix typo in the return type.
	* testsuite/tr1/6_containers/utility/19535.cc: New.

From-SVN: r93940

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3c29b43fa306c5b0b279cb5306c65f006e5ec7f1..f8cb182ee24caa9339d5c84206a82ac584706e1f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-19  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/19535
+       * include/tr1/utility (struct __pair_get<1>::__get, __const_get):
+       Fix typo in the return type.
+       * testsuite/tr1/6_containers/utility/19535.cc: New.
+
 2005-01-19  Loren J. Rittle  <ljrittle@acm.org>
 
        * include/ext/array_allocator.h (array_allocator<>::allocate):

diff --git a/libstdc++-v3/include/tr1/utility b/libstdc++-v3/include/tr1/utility
index c987d0459346b968d244bb77f1695f47de18d578..6a74dfaf4d8d911912c475919f57e71fd893e429 100644 (file)
--- a/libstdc++-v3/include/tr1/utility
+++ b/libstdc++-v3/include/tr1/utility
@@ -1,6 +1,6 @@
 // TR1 utility -*- C++ -*-
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
@@ -66,11 +66,11 @@ namespace tr1
     struct __pair_get<1>
     {
       template<typename _Tp1, typename _Tp2>
-      static _Tp1& __get(std::pair<_Tp1, _Tp2>& __pair)
+      static _Tp2& __get(std::pair<_Tp1, _Tp2>& __pair)
       { return __pair.second; }
 
       template<typename _Tp1, typename _Tp2>
-      static const _Tp1& __const_get(const std::pair<_Tp1, _Tp2>& __pair)
+      static const _Tp2& __const_get(const std::pair<_Tp1, _Tp2>& __pair)
       { return __pair.second; }
     };
 

diff --git a/libstdc++-v3/testsuite/tr1/6_containers/utility/19535.cc b/libstdc++-v3/testsuite/tr1/6_containers/utility/19535.cc
new file mode 100644 (file)
index 0000000..28ac426
--- /dev/null
+++ b/libstdc++-v3/testsuite/tr1/6_containers/utility/19535.cc
@@ -0,0 +1,42 @@
+// 2005-01-19  Petur Runolfsson  <peturr02@ru.is>
+
+// Copyright (C) 2005 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 2, 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 COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// tr1 additions to pair
+
+#include <tr1/utility>
+
+struct A { };
+struct B { };
+
+// libstdc++/19535
+void test01()
+{
+  std::pair<A, B> p;
+  std::tr1::get<1>(p);
+  
+  const std::pair<B, A> q;
+  std::tr1::get<1>(q);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}