From ab9b9d2cf3d913401a88be046afe7113e6448e66 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 24 Feb 2005 18:55:51 +0000 Subject: [PATCH] std_complex.h: _GLIBCXX_USE_C99_COMPLEX_MATH to _GLIBCXX_USE_C99_COMPLEX. 2005-02-24 Benjamin Kosnik * include/std/std_complex.h: _GLIBCXX_USE_C99_COMPLEX_MATH to _GLIBCXX_USE_C99_COMPLEX. * acinclude.m4: Same. * acconfig.h: Same. * configure: Regenerate. * config.h.in: Same. From-SVN: r95508 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/acconfig.h | 2 +- libstdc++-v3/acinclude.m4 | 2 +- libstdc++-v3/config.h.in | 2 +- libstdc++-v3/configure | 2 +- libstdc++-v3/include/Makefile.in | 1 + libstdc++-v3/include/std/std_complex.h | 22 +++++++++++----------- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 62576893e25..76757a8a799 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2005-02-24 Benjamin Kosnik + + * include/std/std_complex.h: _GLIBCXX_USE_C99_COMPLEX_MATH to + _GLIBCXX_USE_C99_COMPLEX. + * acinclude.m4: Same. + * acconfig.h: Same. + * configure: Regenerate. + * config.h.in: Same. + 2005-02-24 Paolo Carlini * include/tr1/functional (mem_fn): Avoid _T, badname on diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h index f1b821630ba..51d588430a3 100644 --- a/libstdc++-v3/acconfig.h +++ b/libstdc++-v3/acconfig.h @@ -20,7 +20,7 @@ #undef _GLIBCXX_USE_C99_MATH // Define if C99 complex math functions should be used in std::complex. -#undef _GLIBCXX_USE_C99_COMPLEX_MATH +#undef _GLIBCXX_USE_C99_COMPLEX // Define if code specialized for wchar_t should be used. #undef _GLIBCXX_USE_WCHAR_T diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index f18b7d90b53..4ef88ad4d55 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -983,7 +983,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [ AC_MSG_RESULT($ac_c99_complex) if test x"$ac_c99_complex" = x"yes"; then - AC_DEFINE(_GLIBCXX_USE_C99_COMPLEX_MATH) + AC_DEFINE(_GLIBCXX_USE_C99_COMPLEX) fi # Check for the existence in of vscanf, et. al. diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index fdcc07cb2a2..76d32d1630f 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -21,7 +21,7 @@ #undef _GLIBCXX_USE_C99_MATH // Define if C99 complex math functions should be used in std::complex. -#undef _GLIBCXX_USE_C99_COMPLEX_MATH +#undef _GLIBCXX_USE_C99_COMPLEX // Define if code specialized for wchar_t should be used. #undef _GLIBCXX_USE_WCHAR_T diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 2d5016a374a..4b59bfe6916 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -8633,7 +8633,7 @@ echo "${ECHO_T}$ac_c99_complex" >&6 if test x"$ac_c99_complex" = x"yes"; then cat >>confdefs.h <<\_ACEOF -#define _GLIBCXX_USE_C99_COMPLEX_MATH 1 +#define _GLIBCXX_USE_C99_COMPLEX 1 _ACEOF fi diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 7688b318233..b7d8a2acef6 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -455,6 +455,7 @@ tr1_headers = \ ${tr1_srcdir}/unordered_set \ ${tr1_srcdir}/unordered_map + # This is the common subset of files that all three "C" header models use. c_base_srcdir = $(C_INCLUDE_DIR) c_base_builddir = . diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h index 1a5c6a0a259..fb8122cfcad 100644 --- a/libstdc++-v3/include/std/std_complex.h +++ b/libstdc++-v3/include/std/std_complex.h @@ -561,7 +561,7 @@ namespace std return __s * sqrt(__x * __x + __y * __y); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline float __complex_abs(__complex__ float __z) { return __builtin_cabsf(__z); } @@ -588,7 +588,7 @@ namespace std __complex_arg(const complex<_Tp>& __z) { return atan2(__z.imag(), __z.real()); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline float __complex_arg(__complex__ float __z) { return __builtin_cargf(__z); } @@ -666,7 +666,7 @@ namespace std return complex<_Tp>(cos(__x) * cosh(__y), -sin(__x) * sinh(__y)); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_cos(__complex__ float __z) { return __builtin_ccosf(__z); } @@ -696,7 +696,7 @@ namespace std return complex<_Tp>(cosh(__x) * cos(__y), sinh(__x) * sin(__y)); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_cosh(__complex__ float __z) { return __builtin_ccoshf(__z); } @@ -722,7 +722,7 @@ namespace std __complex_exp(const complex<_Tp>& __z) { return std::polar(exp(__z.real()), __z.imag()); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_exp(__complex__ float __z) { return __builtin_cexpf(__z); } @@ -782,7 +782,7 @@ namespace std return complex<_Tp>(sin(__x) * cosh(__y), cos(__x) * sinh(__y)); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_sin(__complex__ float __z) { return __builtin_csinf(__z); } @@ -812,7 +812,7 @@ namespace std return complex<_Tp>(sinh(__x) * cos(__y), cosh(__x) * sin(__y)); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_sinh(__complex__ float __z) { return __builtin_csinhf(__z); } @@ -856,7 +856,7 @@ namespace std } } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_sqrt(__complex__ float __z) { return __builtin_csqrtf(__z); } @@ -883,7 +883,7 @@ namespace std __complex_tan(const complex<_Tp>& __z) { return std::sin(__z) / std::cos(__z); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_tan(__complex__ float __z) { return __builtin_ctanf(__z); } @@ -911,7 +911,7 @@ namespace std __complex_tanh(const complex<_Tp>& __z) { return std::sinh(__z) / std::cosh(__z); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_tanh(__complex__ float __z) { return __builtin_ctanhf(__z); } @@ -956,7 +956,7 @@ namespace std __complex_pow(const complex<_Tp>& __x, const complex<_Tp>& __y) { return __x == _Tp() ? _Tp() : std::exp(__y * std::log(__x)); } -#if _GLIBCXX_USE_C99_COMPLEX_MATH +#if _GLIBCXX_USE_C99_COMPLEX inline __complex__ float __complex_pow(__complex__ float __x, __complex__ float __y) { return __builtin_cpowf(__x, __y); } -- 2.30.2