diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2013-08-14 13:27:56 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2013-08-14 13:27:56 +0200 |
| commit | 346334d2405c8026f32d4c95d7a04c2bc87f3968 (patch) | |
| tree | 87922b204a2871e764e1ee97ce885edba8841ef2 /libstdc++-v3 | |
| parent | 27ed665fd6bcaaef0593532a0519d167a6f8c8e4 (diff) | |
| download | gcc-346334d2405c8026f32d4c95d7a04c2bc87f3968.zip gcc-346334d2405c8026f32d4c95d7a04c2bc87f3968.tar.gz gcc-346334d2405c8026f32d4c95d7a04c2bc87f3968.tar.bz2 | |
compatibility.cc (_ZTIe): Use const_cast to avoid warning.
* src/c++98/compatibility.cc (_ZTIe): Use const_cast to avoid warning.
(_ZTIPe): Ditto.
(ZTIPKe): Ditto.
From-SVN: r201723
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/compatibility.cc | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 17267c8..ec48c9e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-08-14 Uros Bizjak <ubizjak@gmail.com> + + * src/c++98/compatibility.cc (_ZTIe): Use const_cast to avoid warning. + (_ZTIPe): Ditto. + (ZTIPKe): Ditto. + 2013-08-09 Tim Shen <timshen91@gmail.com> * include/bits/regex_constants.h: Change syntax_option_type to enum @@ -5,8 +11,7 @@ 2013-08-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> - * include/bits/regex.h: Replace _A, _B, _C, _R by _Ap, _Bp, - _Cp, _Rp. + * include/bits/regex.h: Replace _A, _B, _C, _R by _Ap, _Bp, _Cp, _Rp. 2013-08-08 François Dumont <fdumont@gcc.gnu.org> diff --git a/libstdc++-v3/src/c++98/compatibility.cc b/libstdc++-v3/src/c++98/compatibility.cc index d964e89..febce3f 100644 --- a/libstdc++-v3/src/c++98/compatibility.cc +++ b/libstdc++-v3/src/c++98/compatibility.cc @@ -516,15 +516,18 @@ extern void *_ZTVN10__cxxabiv119__pointer_type_infoE[]; 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"; +// const_casts are used to avoid -Wcast-qual warnings extern __attribute__((used, weak)) const void * const _ZTIe[2] = { (void *) &_ZTVN10__cxxabiv123__fundamental_type_infoE[2], - (void *) _ZTSe }; + const_cast<char*>(_ZTSe) }; extern __attribute__((used, weak)) const void * const _ZTIPe[4] = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2], - (void *) _ZTSPe, (void *) 0L, (void *) _ZTIe }; + const_cast<char*>(_ZTSPe), (void *) 0L, + const_cast<void* const*>(_ZTIe) }; extern __attribute__((used, weak)) const void * const _ZTIPKe[4] = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2], - (void *) _ZTSPKe, (void *) 1L, (void *) _ZTIe }; + const_cast<char*>(_ZTSPKe), (void *) 1L, + const_cast<void* const*>(_ZTIe) }; #endif // _GLIBCXX_LONG_DOUBLE_COMPAT #ifdef _GLIBCXX_SYMVER_DARWIN |