Changes in sources/src/sc_object.cc [17:27]

File:

• sources/src/sc_object.cc (modified) (7 diffs)

sources/src/sc_object.cc

@@ -40 +40 @@
 #include <map>
 
-#include "assert.h"
+#include <cassert>
 #include "sc_object.h"
 //#include "sc_port.h"
@@ -46 +46 @@
 #include "sc_signal.h"
 #include "module_hierarchy.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -71 +74 @@
 //    out += ".";
   }
-//  ASSERT(name != NULL);
+//  assert(name != NULL);
   if (name)
     out += name;
@@ -203 +206 @@
 {
         object2name_t::iterator i = object2fullname.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2fullname.end ()) {
                 cerr << "Internal error : can't find name of " << this << "\n";
@@ -217 +220 @@
 /*
         object2name_t::iterator i = object2fullname.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2fullname.end ()) {
                 cerr << "Internal error : can't find name of " << this << "\n";
@@ -235 +238 @@
     string     out;
     sc_object* obj = *it;
-    ASSERT(obj != NULL);
+    assert(obj != NULL);
     build_full_name (out, *obj);
   }
@@ -243 +246 @@
 {
         object2infos_t::iterator i = object2infos.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2infos.end ()) {
                 cerr << "Internal error : can't find kind of " << this << "\n";