diff options
| author | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-13 21:58:53 +0000 |
|---|---|---|
| committer | glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-13 21:58:53 +0000 |
| commit | 79bd723ef1d9b2955b3c0c9654a95555117feec4 (patch) | |
| tree | e62855d65f3dc4a07ed76d169c9d756ebb55c6df /libstdc++-v3/include/c_compatibility | |
| parent | f2309b6a8d23291ecf53e5beb40c06a90e6b27e6 (diff) | |
| download | ppe42-gcc-79bd723ef1d9b2955b3c0c9654a95555117feec4.tar.gz ppe42-gcc-79bd723ef1d9b2955b3c0c9654a95555117feec4.zip | |
2013-02-13 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/56111
* include/std/complex (complex): Undefine.
* include/c_compatibility/complex.h (complex): Only undefine if
<complex> has been included.
* testsuite/26_numerics/complex/56111.cc: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196034 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/c_compatibility')
| -rw-r--r-- | libstdc++-v3/include/c_compatibility/complex.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/include/c_compatibility/complex.h b/libstdc++-v3/include/c_compatibility/complex.h index cf7f72fc6b6..be0e82def26 100644 --- a/libstdc++-v3/include/c_compatibility/complex.h +++ b/libstdc++-v3/include/c_compatibility/complex.h @@ -34,7 +34,10 @@ #if _GLIBCXX_HAVE_COMPLEX_H # include_next <complex.h> -# undef complex +# ifdef _GLIBCXX_COMPLEX +// See PR56111, keep the macro in C++03 if possible. +# undef complex +# endif #endif #ifndef _GLIBCXX_COMPLEX_H |
