re PR libstdc++/27867 (compile error in repeated application of valarray<>::operator==)

2006-06-04  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/27867
	* include/bits/valarray_before.h (struct _BinClos<_Oper, _ValArray,
	_ValArray, _Tp, _Tp>): Fix value_type typedef.
	* testsuite/26_numerics/valarray/27867.cc: New.

From-SVN: r114356

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 791b42f9dc8d4682d76b055c8e2389af609ab0c3..0990cbde20ca094ca1a3fd431e4a074c783a0290 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-04  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/27867
+       * include/bits/valarray_before.h (struct _BinClos<_Oper, _ValArray,
+       _ValArray, _Tp, _Tp>): Fix value_type typedef.
+       * testsuite/26_numerics/valarray/27867.cc: New.
+
 2006-05-29  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/24692

diff --git a/libstdc++-v3/include/bits/valarray_before.h b/libstdc++-v3/include/bits/valarray_before.h
index 5a294af893d43eddeb08cac30875fe8fdf80aed5..ad771e85e886f406b159703f4b2300d6b68bc159 100644 (file)
--- a/libstdc++-v3/include/bits/valarray_before.h
+++ b/libstdc++-v3/include/bits/valarray_before.h
@@ -1,6 +1,6 @@
 // The template and inlines for the -*- C++ -*- internal _Meta class.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -589,7 +589,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     : _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> >
     {
       typedef _BinBase<_Oper, valarray<_Tp>, valarray<_Tp> > _Base;
-      typedef _Tp value_type;
+      typedef typename _Base::value_type value_type;
 
       _BinClos(const valarray<_Tp>& __v, const valarray<_Tp>& __w)
       : _Base(__v, __w) {}

diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/27867.cc b/libstdc++-v3/testsuite/26_numerics/valarray/27867.cc
new file mode 100644 (file)
index 0000000..7c208f4
--- /dev/null
+++ b/libstdc++-v3/testsuite/26_numerics/valarray/27867.cc
@@ -0,0 +1,53 @@
+// Copyright (C) 2006 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#include <valarray>
+#include <testsuite_hooks.h>
+
+// libstdc++/27867
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  std::valarray<int> v1(100, 1);
+  std::valarray<int> v2(100, 1);
+  std::valarray<bool> v3(true, 1);
+
+  std::valarray<bool> resl(1);
+  resl = ((v1 == v2) == v3);
+  VERIFY( resl[0] == true );
+
+  std::valarray<bool> resr(1);
+  resr = (v3 == (v1 == v2));
+  VERIFY( resr[0] == true );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}