diff options
| author | Loren J. Rittle <ljrittle@acm.org> | 2003-04-18 06:58:42 +0000 |
|---|---|---|
| committer | Loren J. Rittle <ljrittle@gcc.gnu.org> | 2003-04-18 06:58:42 +0000 |
| commit | c04ec67ecdbf019e1f3bb43846441d4dfa5c3732 (patch) | |
| tree | 4bfe691765a8e5e2534bfe5ae1867e5e886603a5 | |
| parent | 6a29edeae52a48b159ebe4eb024be65b8d69eb9b (diff) | |
| download | gcc-c04ec67ecdbf019e1f3bb43846441d4dfa5c3732.zip gcc-c04ec67ecdbf019e1f3bb43846441d4dfa5c3732.tar.gz gcc-c04ec67ecdbf019e1f3bb43846441d4dfa5c3732.tar.bz2 | |
std_cmath.h (C99 FP capture): Only undefine said C99 FP macros, if actually captured.
* include/c_std/std_cmath.h (C99 FP capture): Only undefine said
C99 FP macros, if actually captured.
From-SVN: r65777
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_std/std_cmath.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ad9db7c..0237c4a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-04-18 Loren J. Rittle <ljrittle@acm.org> + + * include/c_std/std_cmath.h (C99 FP capture): Only undefine said + C99 FP macros, if actually captured. + 2003-04-17 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/9555 diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h index 1264c4d..c9a88cf 100644 --- a/libstdc++-v3/include/c_std/std_cmath.h +++ b/libstdc++-v3/include/c_std/std_cmath.h @@ -646,10 +646,9 @@ namespace __gnu_cxx int __capture_isunordered(_Tp __f1, _Tp __f2) { return isunordered(__f1, __f2); } -} -#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */ -#endif +} +// Only undefine the C99 FP macros, if actually captured for namespace movement #undef fpclassify #undef isfinite #undef isinf @@ -662,6 +661,8 @@ namespace __gnu_cxx #undef islessequal #undef islessgreater #undef isunordered +#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */ +#endif #if _GLIBCPP_USE_C99 #if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC |