diff options
| author | Jason Merrill <jason@redhat.com> | 2015-11-14 00:11:34 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2015-11-14 00:11:34 +0000 |
| commit | 1da6b773e737548a7ffbfc950774460433ef9bb8 (patch) | |
| tree | e5f2d64459601fae812cfe90245af2831eebedb1 /libstdc++-v3/include/std/complex | |
| parent | 4587dbe905c7599512c23af5b55591a06bf829b9 (diff) | |
| parent | d77055b11cf7e121d66f2da7dfbc5f63347c7d7f (diff) | |
Merge trunk@230365.c++-delayed-folding
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c++-delayed-folding@230367 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/complex')
| -rw-r--r-- | libstdc++-v3/include/std/complex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 5ed4fd571f1..f1d3b79f504 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -995,7 +995,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION complex<_Tp> pow(const complex<_Tp>& __x, const _Tp& __y) { -#ifndef _GLIBCXX_USE_C99_COMPLEX +#if ! _GLIBCXX_USE_C99_COMPLEX if (__x == _Tp()) return _Tp(); #endif @@ -1831,7 +1831,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION arg(_Tp __x) { typedef typename __gnu_cxx::__promote<_Tp>::__type __type; -#if (_GLIBCXX_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) +#if (_GLIBCXX11_USE_C99_MATH && !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC) return std::signbit(__x) ? __type(3.1415926535897932384626433832795029L) : __type(); #else |