From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 14 Aug 2013 14:22:56 +0000 (+0000)
Subject: 	* src/c++98/compatibility.cc (_ZTIe): Use (const cast *)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ebd3abd61e585b899a4b5d869b4aa40977cdd9f;p=thirdparty%2Fgcc.git

	* src/c++98/compatibility.cc (_ZTIe): Use (const cast *)
	to avoid -Wcast-qual warnings.
	(_ZTIPe): Ditto.
	(ZTIPKe): Ditto.



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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ec48c9e69933..a9c006800b4a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,7 @@
 2013-08-14  Uros Bizjak  <ubizjak@gmail.com>
 
-	* src/c++98/compatibility.cc (_ZTIe): Use const_cast to avoid warning.
+	* src/c++98/compatibility.cc (_ZTIe): Use (const cast *)
+	to avoid -Wcast-qual warnings.
 	(_ZTIPe): Ditto.
 	(ZTIPKe): Ditto.
 
diff --git a/libstdc++-v3/src/c++98/compatibility.cc b/libstdc++-v3/src/c++98/compatibility.cc
index febce3f42794..0a4e45bbe1c1 100644
--- a/libstdc++-v3/src/c++98/compatibility.cc
+++ b/libstdc++-v3/src/c++98/compatibility.cc
@@ -516,18 +516,17 @@ 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],
-      const_cast<char*>(_ZTSe) };
+  = { (const void *) &_ZTVN10__cxxabiv123__fundamental_type_infoE[2],
+      (const void *) _ZTSe };
 extern __attribute__((used, weak)) const void * const _ZTIPe[4]
-  = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
-      const_cast<char*>(_ZTSPe), (void *) 0L,
-      const_cast<void* const*>(_ZTIe) };
+  = { (const void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
+      (const void *) _ZTSPe, (const void *) 0L,
+      (const void *) _ZTIe };
 extern __attribute__((used, weak)) const void * const _ZTIPKe[4]
-  = { (void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
-      const_cast<char*>(_ZTSPKe), (void *) 1L,
-      const_cast<void* const*>(_ZTIe) };
+  = { (const void *) &_ZTVN10__cxxabiv119__pointer_type_infoE[2],
+      (const void *) _ZTSPKe, (const void *) 1L,
+      (const void *) _ZTIe };
 #endif // _GLIBCXX_LONG_DOUBLE_COMPAT
 
 #ifdef _GLIBCXX_SYMVER_DARWIN