Changeset 8 for branches/with_autoconf/src/sc_object.cc

Timestamp:

Jun 25, 2008, 1:08:04 PM (16 years ago)

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/sc_object.cc (modified) (7 diffs)

branches/with_autoconf/src/sc_object.cc

@@ -39 +39 @@
 #include <map>
 
-#include "assert.h"
+#include <cassert>
 #include "sc_object.h"
 //#include "sc_port.h"
@@ -45 +45 @@
 #include "sc_signal.h"
 #include "module_hierarchy.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -70 +73 @@
 //    out += ".";
   }
-//  ASSERT(name != NULL);
+//  assert(name != NULL);
   if (name)
     out += name;
@@ -202 +205 @@
 {
         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";
@@ -216 +219 @@
 /*
         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";
@@ -234 +237 @@
     string     out;
     sc_object* obj = *it;
-    ASSERT(obj != NULL);
+    assert(obj != NULL);
     build_full_name (out, *obj);
   }
@@ -242 +245 @@
 {
         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";