OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/69450 (libstdc++-v3/include/math.h:66:1 2: error: 'constexpr bool std::isnan(double)' conflicts with a previous declaration) 

PR libstdc++/69450
	* acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Split check for obsolete
	isinf and isnan functions into two independent checks.  Check on hpux.
	* config.h.in: Regenerate.
	* configure: Regenerate.
	* include/c_global/cmath (isinf(double), isnan(double)): Use
	_GLIBCXX_HAVE_OBSOLETE_ISINF and _GLIBCXX_HAVE_OBSOLETE_ISNAN,
	respectively.

From-SVN: r232925
This commit is contained in:
John David Anglin 2016-01-28 13:09:23 +00:00
parent e0ef6912de
commit 69b0daeb4a
5 changed files with 94 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,14 @@
2016-01-28 John David Anglin <danglin@gcc.gnu.org>
PR libstdc++/69450
* acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): Split check for obsolete
isinf and isnan functions into two independent checks. Check on hpux.
* config.h.in: Regenerate.
* configure: Regenerate.
* include/c_global/cmath (isinf(double), isnan(double)): Use
_GLIBCXX_HAVE_OBSOLETE_ISINF and _GLIBCXX_HAVE_OBSOLETE_ISNAN,
respectively.
2016-01-27 Jakub Jelinek <jakub@redhat.com>
* testsuite/libstdc++-prettyprinters/whatis.cc: Include <random>.

43
libstdc++-v3/acinclude.m4
View File

@ -2186,39 +2186,54 @@ AC_DEFUN([GLIBCXX_CHECK_MATH11_PROTO], [
fi
AC_MSG_RESULT([$glibcxx_cv_math11_overload])
;;
*-*-*gnu* | *-*-aix*)
*-*-*gnu* | *-*-aix* | *-*-hpux*)
# If <math.h> defines the obsolete isinf(double) and isnan(double)
# functions (instead of or as well as the C99 generic macros) then we
# can't define std::isinf(double) and std::isnan(double) in <cmath>
# and must use the ones from <math.h> instead.
AC_MSG_CHECKING([for obsolete isinf and isnan functions in <math.h>])
AC_CACHE_VAL(glibcxx_cv_obsolete_isinf_isnan, [
AC_MSG_CHECKING([for obsolete isinf function in <math.h>])
AC_CACHE_VAL(glibcxx_cv_obsolete_isinf, [
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[#include <math.h>
#undef isinf
#undef isnan
namespace std {
using ::isinf;
bool isinf(float);
bool isinf(long double);
}
using std::isinf;
bool b = isinf(0.0);
])],
[glibcxx_cv_obsolete_isinf=yes],
[glibcxx_cv_obsolete_isinf=no]
)])
AC_MSG_RESULT([$glibcxx_cv_obsolete_isinf])
if test $glibcxx_cv_obsolete_isinf = yes; then
AC_DEFINE(HAVE_OBSOLETE_ISINF, 1,
[Define if <math.h> defines obsolete isinf function.])
fi
AC_MSG_CHECKING([for obsolete isnan function in <math.h>])
AC_CACHE_VAL(glibcxx_cv_obsolete_isnan, [
AC_COMPILE_IFELSE([AC_LANG_SOURCE(
[#include <math.h>
#undef isnan
namespace std {
using ::isnan;
bool isnan(float);
bool isnan(long double);
}
using std::isinf;
using std::isnan;
bool b = isinf(0.0) || isnan(0.0);
bool b = isnan(0.0);
])],
[glibcxx_cv_obsolete_isinf_isnan=yes],
[glibcxx_cv_obsolete_isinf_isnan=no]
[glibcxx_cv_obsolete_isnan=yes],
[glibcxx_cv_obsolete_isnan=no]
)])
if test $glibcxx_cv_obsolete_isinf_isnan = yes; then
AC_DEFINE(HAVE_OBSOLETE_ISINF_ISNAN, 1,
[Define if <math.h> defines obsolete isinf and isnan functions.])
AC_MSG_RESULT([$glibcxx_cv_obsolete_isnan])
if test $glibcxx_cv_obsolete_isnan = yes; then
AC_DEFINE(HAVE_OBSOLETE_ISNAN, 1,
[Define if <math.h> defines obsolete isnan function.])
fi
AC_MSG_RESULT([$glibcxx_cv_obsolete_isinf_isnan])
;;
esac

7
libstdc++-v3/config.h.in
View File

@ -300,8 +300,11 @@
/* Define to 1 if you have the <nan.h> header file. */
#undef HAVE_NAN_H
/* Define if <math.h> defines obsolete isinf and isnan functions. */
#undef HAVE_OBSOLETE_ISINF_ISNAN
/* Define if <math.h> defines obsolete isinf function. */
#undef HAVE_OBSOLETE_ISINF
/* Define if <math.h> defines obsolete isnan function. */
#undef HAVE_OBSOLETE_ISNAN
/* Define if poll is available in <poll.h>. */
#undef HAVE_POLL

65
libstdc++-v3/configure vendored
View File

@ -18177,14 +18177,14 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_math11_overload" >&5
$as_echo "$glibcxx_cv_math11_overload" >&6; }
;;
*-*-*gnu* | *-*-aix*)
*-*-*gnu* | *-*-aix* | *-*-hpux*)
# If <math.h> defines the obsolete isinf(double) and isnan(double)
# functions (instead of or as well as the C99 generic macros) then we
# can't define std::isinf(double) and std::isnan(double) in <cmath>
# and must use the ones from <math.h> instead.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obsolete isinf and isnan functions in <math.h>" >&5
$as_echo_n "checking for obsolete isinf and isnan functions in <math.h>... " >&6; }
if test "${glibcxx_cv_obsolete_isinf_isnan+set}" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obsolete isinf function in <math.h>" >&5
$as_echo_n "checking for obsolete isinf function in <math.h>... " >&6; }
if test "${glibcxx_cv_obsolete_isinf+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@ -18192,38 +18192,67 @@ else
/* end confdefs.h. */
#include <math.h>
#undef isinf
#undef isnan
namespace std {
using ::isinf;
bool isinf(float);
bool isinf(long double);
using ::isnan;
bool isnan(float);
bool isnan(long double);
}
using std::isinf;
using std::isnan;
bool b = isinf(0.0) || isnan(0.0);
bool b = isinf(0.0);
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
glibcxx_cv_obsolete_isinf_isnan=yes
glibcxx_cv_obsolete_isinf=yes
else
glibcxx_cv_obsolete_isinf_isnan=no
glibcxx_cv_obsolete_isinf=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_obsolete_isinf" >&5
$as_echo "$glibcxx_cv_obsolete_isinf" >&6; }
if test $glibcxx_cv_obsolete_isinf = yes; then
if test $glibcxx_cv_obsolete_isinf_isnan = yes; then
$as_echo "#define HAVE_OBSOLETE_ISINF_ISNAN 1" >>confdefs.h
$as_echo "#define HAVE_OBSOLETE_ISINF 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for obsolete isnan function in <math.h>" >&5
$as_echo_n "checking for obsolete isnan function in <math.h>... " >&6; }
if test "${glibcxx_cv_obsolete_isnan+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <math.h>
#undef isnan
namespace std {
using ::isnan;
bool isnan(float);
bool isnan(long double);
}
using std::isnan;
bool b = isnan(0.0);
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
glibcxx_cv_obsolete_isnan=yes
else
glibcxx_cv_obsolete_isnan=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_obsolete_isnan" >&5
$as_echo "$glibcxx_cv_obsolete_isnan" >&6; }
if test $glibcxx_cv_obsolete_isnan = yes; then
$as_echo "#define HAVE_OBSOLETE_ISNAN 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_cv_obsolete_isinf_isnan" >&5
$as_echo "$glibcxx_cv_obsolete_isinf_isnan" >&6; }
;;
esac

4
libstdc++-v3/include/c_global/cmath
View File

@ -610,7 +610,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
isinf(float __x)
{ return __builtin_isinf(__x); }
#if _GLIBCXX_HAVE_OBSOLETE_ISINF_ISNAN \
#if _GLIBCXX_HAVE_OBSOLETE_ISINF \
&& !_GLIBCXX_NO_OBSOLETE_ISINF_ISNAN_DYNAMIC
using ::isinf;
#else
@ -635,7 +635,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
isnan(float __x)
{ return __builtin_isnan(__x); }
#if _GLIBCXX_HAVE_OBSOLETE_ISINF_ISNAN \
#if _GLIBCXX_HAVE_OBSOLETE_ISNAN \
&& !_GLIBCXX_NO_OBSOLETE_ISINF_ISNAN_DYNAMIC
using ::isnan;
#else