X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FTypeInfo.cc;h=bed28764c3f9d6595abfd8297b278f063bfa45ea;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=c6860f5076d48f7c73c2f07fb3e905a4a5022f67;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Utils/TypeInfo.cc b/Utils/TypeInfo.cc
index c6860f5..bed2876 100644
--- a/Utils/TypeInfo.cc
+++ b/Utils/TypeInfo.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,33 +20,27 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief TypeInfo non-inline non-template implementation */
 
 #include "TypeInfo.hh"
 //#include "TypeInfo.ih"
 
 // Custom includes
-#include "malloc.h"
-#define HAVE_DECL_BASENAME 1
-#define HAVE_DECL_ASPRINTF 1
-#define HAVE_DECL_VASPRINTF 1
-#include "impl/demangle.h"
+#include <cxxabi.h>
+#include <malloc.h>
 
 //#include "TypeInfo.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-
-// WARNING: This is completely g++ and libiberty dependent. The demangling 
-// interface isn't even explicitly exportet from libiberty. However, it is 
-// *EXTREMELY* helpful for debugging ...
-
-prefix_ std::string satcom::lib::prettyName(std::type_info const & type)
+prefix_ std::string senf::prettyName(std::type_info const & type)
 {
     char const * mangled = type.name();
-    char * demangled = ::cplus_demangle(mangled,DMGL_TYPES|DMGL_AUTO);
+    int status (0);
+    char * demangled ( abi::__cxa_demangle(mangled, 0, 0, &status) );
     std::string name (demangled ? demangled : mangled);
-    if (demangled) 
+    if (demangled)
         ::free(demangled);
     return name;
 }
@@ -58,5 +52,10 @@ prefix_ std::string satcom::lib::prettyName(std::type_info const & type)
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: