Parcourir la source

Fix model name display error in trace and DESTRUCT

Eric Ramat il y a 7 ans
Parent
commit
afbabc7059

+ 2 - 2
src/artis/kernel/AbstractAtomicModel.hpp

@@ -50,7 +50,7 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >(
                    true,
-                   boost::core::demangle(typeid(T).name()).erase(0,6),
+                   boost::core::demangle(typeid(T).name()), // .erase(0,6),
                    utils::DoubleTime::null,
                    utils::CONSTRUCT);
         utils::Trace < utils::DoubleTime >::trace().flush();
@@ -61,7 +61,7 @@ public:
     {
 #ifdef WITH_TRACE
         trace_element(true, utils::DoubleTime::null,
-                      utils::CONSTRUCT);
+                      utils::DESTRUCT);
 #endif
     }
 

+ 3 - 3
src/artis/kernel/AbstractCoupledModel.hpp

@@ -78,7 +78,7 @@ public:
         utils::Trace < utils::DoubleTime >::trace()
             << utils::TraceElement < utils::DoubleTime >(
                    true,
-                   boost::core::demangle(typeid(T).name()).erase(0,6),
+                   boost::core::demangle(typeid(T).name()), // .erase(0,6),
                    utils::DoubleTime::null,
                    utils::CONSTRUCT);
         utils::Trace < utils::DoubleTime >::trace().flush();
@@ -294,10 +294,10 @@ public:
                     "/[" + std::to_string(i) + "]" +
                     boost::core::demangle(typeid(*this).name());
             } else {
-                return p + "/" + boost::core::demangle(typeid(*this).name()).erase(0,6);
+                return p + "/" + boost::core::demangle(typeid(*this).name()); // .erase(0,6);
             }
         } else {
-            return boost::core::demangle(typeid(*this).name()).erase(0,6);
+            return boost::core::demangle(typeid(*this).name()); // .erase(0,6);
         }
     }
 

+ 2 - 2
src/artis/kernel/AbstractModel.hpp

@@ -106,10 +106,10 @@ public:
         if (index >= 0) {
             return p +
                 "/[" + std::to_string(index) + "]" +
-                boost::core::demangle(typeid(*child).name()).erase(0,6);
+                boost::core::demangle(typeid(*child).name()); // .erase(0,6);
         } else {
             return (p.empty() ? "" : p + "/") +
-                boost::core::demangle(typeid(*child).name()).erase(0,6);
+                boost::core::demangle(typeid(*child).name()); // .erase(0,6);
         }
     }