diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
|---|---|---|
| committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
| commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
| tree | 637f745404b37fbf3fcff629227d7d542725e5fe /gcc-4.9/libstdc++-v3/include/std/complex | |
| parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
| download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip | |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
Diffstat (limited to 'gcc-4.9/libstdc++-v3/include/std/complex')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/include/std/complex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc-4.9/libstdc++-v3/include/std/complex b/gcc-4.9/libstdc++-v3/include/std/complex index 3104b584e..f4fe2f35f 100644 --- a/gcc-4.9/libstdc++-v3/include/std/complex +++ b/gcc-4.9/libstdc++-v3/include/std/complex @@ -50,7 +50,7 @@ // <complex.h> is defined to provide only what C++11's <ccomplex> does in a // different namespace. #ifdef _GLIBCXX_C99_COMPLEX_H -#error Cannot include both <complex> and C99's <complex.h> +#error "Cannot include both <complex> and C99 <complex.h>" #endif namespace std _GLIBCXX_VISIBILITY(default) @@ -147,11 +147,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // DR 387. std::complex over-encapsulated. _GLIBCXX_ABI_TAG_CXX11 constexpr _Tp - real() { return _M_real; } + real() const { return _M_real; } _GLIBCXX_ABI_TAG_CXX11 constexpr _Tp - imag() { return _M_imag; } + imag() const { return _M_imag; } #else /// Return real part of complex number. _Tp& |