diff options
| author | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-17 18:16:42 -0700 |
| commit | 61c0330cc243abf13fdd01f377a7f80bd3989eb1 (patch) | |
| tree | 119b08ae76294f23e2b1b7e72ff9a06afa9e8509 /gcc-4.8/libstdc++-v3/src | |
| parent | 1c712bf7621f3859c33fd3afaa61fdcaf3fdfd76 (diff) | |
| download | toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.gz toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.tar.bz2 toolchain_gcc-61c0330cc243abf13fdd01f377a7f80bd3989eb1.zip | |
[4.8] Merge GCC 4.8.2
Change-Id: I0f1fcf69c5076d8534c5c45562745e1a37adb197
Diffstat (limited to 'gcc-4.8/libstdc++-v3/src')
| -rw-r--r-- | gcc-4.8/libstdc++-v3/src/c++98/compatibility.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/gcc-4.8/libstdc++-v3/src/c++98/compatibility.cc b/gcc-4.8/libstdc++-v3/src/c++98/compatibility.cc index d964e89db..3f21c581e 100644 --- a/gcc-4.8/libstdc++-v3/src/c++98/compatibility.cc +++ b/gcc-4.8/libstdc++-v3/src/c++98/compatibility.cc @@ -517,14 +517,21 @@ extern __attribute__((used, weak)) const char _ZTSe[2] = "e"; extern __attribute__((used, weak)) const char _ZTSPe[3] = "Pe"; extern __attribute__((used, weak)) const char _ZTSPKe[4] = "PKe"; extern __attribute__((used, weak)) const void * const _ZTIe[2] - = { (void *) &_ZTVN10__cxxabiv123__fundamental_type_infoE[2], - (void *) _ZTSe }; + = { reinterpret_cast<const void *> + (&_ZTVN10__cxxabiv123__fundamental_type_infoE[2]), + reinterpret_cast<const void *>(_ZTSe) }; extern __attribute__((used, weak)) const void * const _ZTIPe[4] - = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2], - (void *) _ZTSPe, (void *) 0L, (void *) _ZTIe }; + = { reinterpret_cast<const void *> + (&_ZTVN10__cxxabiv119__pointer_type_infoE[2]), + reinterpret_cast<const void *>(_ZTSPe), + reinterpret_cast<const void *>(0L), + reinterpret_cast<const void *>(_ZTIe) }; extern __attribute__((used, weak)) const void * const _ZTIPKe[4] - = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2], - (void *) _ZTSPKe, (void *) 1L, (void *) _ZTIe }; + = { reinterpret_cast<const void *> + (&_ZTVN10__cxxabiv119__pointer_type_infoE[2]), + reinterpret_cast<const void *>(_ZTSPKe), + reinterpret_cast<const void *>(1L), + reinterpret_cast<const void *>(_ZTIe) }; #endif // _GLIBCXX_LONG_DOUBLE_COMPAT #ifdef _GLIBCXX_SYMVER_DARWIN |