[Gnash-commit] gnash ChangeLog server/as_object.h

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/06/13 13:21:05

Modified files:
        .              : ChangeLog 
        server         : as_object.h 

Log message:
        Make use of the typeName function that magically appeared in my 
checkout.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6919&r2=1.6920
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.111&r2=1.112

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6919
retrieving revision 1.6920
diff -u -b -r1.6919 -r1.6920
--- ChangeLog   13 Jun 2008 12:20:38 -0000      1.6919
+++ ChangeLog   13 Jun 2008 13:21:04 -0000      1.6920
@@ -1,5 +1,10 @@
 2008-06-13 Bastiaan Jacques <address@hidden>
 
+       * server/as_object.h: Make use of the typeName function that magically
+       appeared in my checkout.
+
+2008-06-13 Bastiaan Jacques <address@hidden>
+
        * backend/render_handler_ogl.cpp: Stick the push-pop matrix sequence
        in a scoped class.
 

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- server/as_object.h  29 May 2008 12:53:44 -0000      1.111
+++ server/as_object.h  13 Jun 2008 13:21:05 -0000      1.112
@@ -1149,27 +1149,8 @@
        boost::intrusive_ptr<T> ret = boost::dynamic_pointer_cast<T>(obj);
 
        if (!ret) {
-               std::string     target = typeid(T).name(),
-                               source = typeid(*obj.get()).name();
-#if defined(__GNUC__) && __GNUC__ > 2
-               int status;
-               char* target_unmangled = 
-                       abi::__cxa_demangle (target.c_str(), NULL, NULL,
-                                            &status);
-               if (status == 0) {
-                       target = target_unmangled;
-                       free(target_unmangled);
-               }
-
-               char* source_unmangled =
-                       abi::__cxa_demangle (source.c_str(), NULL, NULL,
-                                            &status);
-
-               if (status == 0) {
-                       source = source_unmangled;
-                       free(source_unmangled);
-               }
-#endif // __GNUC__ > 2
+               std::string     target = typeName(ret.get()),
+                               source = typeName(*obj.get());
 
                std::string msg = "builtin method or gettersetter for " +
                        target + " called from " + source + " instance.";