Piotr Caban : msvcrt: Don' t define type_info structures as const so we can set demangled class name.

Alexandre Julliard julliard at winehq.org
Fri Oct 20 15:09:36 CDT 2017


Module: wine
Branch: master
Commit: 7274ed63e2165f3d0c500660aa4d89a57d89f3d5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7274ed63e2165f3d0c500660aa4d89a57d89f3d5

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Oct 20 13:02:19 2017 +0200

msvcrt: Don't define type_info structures as const so we can set demangled class name.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcp90/cxx.h | 4 ++--
 dlls/msvcrt/cxx.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h
index ddf9421..3da510e 100644
--- a/dlls/msvcp90/cxx.h
+++ b/dlls/msvcp90/cxx.h
@@ -68,7 +68,7 @@
 #ifndef __x86_64__
 
 #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
+    static type_info name ## _type_info = { \
         &MSVCP_type_info_vtable, \
         NULL, \
         mangled_name \
@@ -140,7 +140,7 @@ static const cxx_exception_type type ## _cxx_type = { \
 #else
 
 #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
+    static type_info name ## _type_info = { \
         &MSVCP_type_info_vtable, \
         NULL, \
         mangled_name \
diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h
index 50bf7ca..027026e 100644
--- a/dlls/msvcrt/cxx.h
+++ b/dlls/msvcrt/cxx.h
@@ -67,7 +67,7 @@
 #ifndef __x86_64__
 
 #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
+    static type_info name ## _type_info = { \
         &MSVCRT_type_info_vtable, \
         NULL, \
         mangled_name \
@@ -113,7 +113,7 @@ const rtti_object_locator name ## _rtti = { \
 #else
 
 #define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
+    static type_info name ## _type_info = { \
         &MSVCRT_type_info_vtable, \
         NULL, \
         mangled_name \




More information about the wine-cvs mailing list