* src/c++98/compatibility.cc (_ZTIe): Use const_cast to avoid warning.

	(_ZTIPe): Ditto.
	(ZTIPKe): Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@201723 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 17267c8380ddccb57e6d3b631b8d64f5851357ba..ec48c9e699339a4ab0fd017c8e404ee661cf32be 100644 (file)
--- 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 d964e89db4c290483b8e0d0a8ca308d16f1a6681..febce3f42794ef315da8e6f4136a985625840daf 100644 (file)
--- 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