This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] libstdc++/19322
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sun, 16 Jan 2005 11:04:00 +0100
- Subject: [v3] libstdc++/19322
Hi,
I have applied the following patch, reviewed by Gaby and tested
by myself on x86-linux, by Eric Botcazou on SPARC/Solaris 2.5.1,
2.6, 7, 8 and 9 and by Gerald Pfeifer on i386-unknown-freebsd4.10
Paolo.
//////////////
2005-01-16 Lorenz Minder <lminder@gmx.net>
Paolo Carlini <pcarlini@suse.de>
PR libstdc++/19322
* include/c_std/std_cmath.h: Define the C99 classification facilities
directly inside namespace std:.
* testsuite/26_numerics/cmath/19322.cc: New.
diff -urN libstdc++-v3-orig/include/c_std/std_cmath.h libstdc++-v3/include/c_std/std_cmath.h
--- libstdc++-v3-orig/include/c_std/std_cmath.h 2003-12-29 20:26:11.000000000 +0100
+++ libstdc++-v3/include/c_std/std_cmath.h 2005-01-16 10:38:03.000000000 +0100
@@ -1,6 +1,6 @@
// -*- C++ -*- C forwarding header.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@@ -510,80 +510,62 @@
#undef islessequal
#undef islessgreater
#undef isunordered
-#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
-#endif
-#if _GLIBCXX_USE_C99_MATH
-#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-namespace __gnu_cxx
+namespace std
{
template<typename _Tp>
int
- fpclassify(_Tp __f) { return __capture_fpclassify(__f); }
+ fpclassify(_Tp __f) { return __gnu_cxx::__capture_fpclassify(__f); }
template<typename _Tp>
int
- isfinite(_Tp __f) { return __capture_isfinite(__f); }
+ isfinite(_Tp __f) { return __gnu_cxx::__capture_isfinite(__f); }
template<typename _Tp>
int
- isinf(_Tp __f) { return __capture_isinf(__f); }
+ isinf(_Tp __f) { return __gnu_cxx::__capture_isinf(__f); }
template<typename _Tp>
int
- isnan(_Tp __f) { return __capture_isnan(__f); }
+ isnan(_Tp __f) { return __gnu_cxx::__capture_isnan(__f); }
template<typename _Tp>
int
- isnormal(_Tp __f) { return __capture_isnormal(__f); }
+ isnormal(_Tp __f) { return __gnu_cxx::__capture_isnormal(__f); }
template<typename _Tp>
int
- signbit(_Tp __f) { return __capture_signbit(__f); }
+ signbit(_Tp __f) { return __gnu_cxx::__capture_signbit(__f); }
template<typename _Tp>
int
- isgreater(_Tp __f1, _Tp __f2) { return __capture_isgreater(__f1, __f2); }
+ isgreater(_Tp __f1, _Tp __f2)
+ { return __gnu_cxx::__capture_isgreater(__f1, __f2); }
template<typename _Tp>
int
isgreaterequal(_Tp __f1, _Tp __f2)
- { return __capture_isgreaterequal(__f1, __f2); }
+ { return __gnu_cxx::__capture_isgreaterequal(__f1, __f2); }
template<typename _Tp>
int
- isless(_Tp __f1, _Tp __f2) { return __capture_isless(__f1, __f2); }
+ isless(_Tp __f1, _Tp __f2)
+ { return __gnu_cxx::__capture_isless(__f1, __f2); }
template<typename _Tp>
int
islessequal(_Tp __f1, _Tp __f2)
- { return __capture_islessequal(__f1, __f2); }
+ { return __gnu_cxx::__capture_islessequal(__f1, __f2); }
template<typename _Tp>
int
islessgreater(_Tp __f1, _Tp __f2)
- { return __capture_islessgreater(__f1, __f2); }
+ { return __gnu_cxx::__capture_islessgreater(__f1, __f2); }
template<typename _Tp>
int
isunordered(_Tp __f1, _Tp __f2)
- { return __capture_isunordered(__f1, __f2); }
-}
-
-namespace std
-{
- using __gnu_cxx::fpclassify;
- using __gnu_cxx::isfinite;
- using __gnu_cxx::isinf;
- using __gnu_cxx::isnan;
- using __gnu_cxx::isnormal;
- using __gnu_cxx::signbit;
- using __gnu_cxx::isgreater;
- using __gnu_cxx::isgreaterequal;
- using __gnu_cxx::isless;
- using __gnu_cxx::islessequal;
- using __gnu_cxx::islessgreater;
- using __gnu_cxx::isunordered;
+ { return __gnu_cxx::__capture_isunordered(__f1, __f2); }
}
#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
#endif
diff -urN libstdc++-v3-orig/testsuite/26_numerics/cmath/19322.cc libstdc++-v3/testsuite/26_numerics/cmath/19322.cc
--- libstdc++-v3-orig/testsuite/26_numerics/cmath/19322.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/26_numerics/cmath/19322.cc 2005-01-16 10:30:08.000000000 +0100
@@ -0,0 +1,47 @@
+// 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.
+
+// 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 <cmath>
+#include <testsuite_hooks.h>
+
+#if _GLIBCXX_USE_C99
+// libstdc++/19322
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+
+ VERIFY( !std::isnan(3.0) );
+}
+#endif
+
+int main()
+{
+#if _GLIBCXX_USE_C99
+ test01();
+#endif
+ return 0;
+}