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

File:

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

sources/src/sc_object.cc

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