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

Timestamp:

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

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/sc_module.cc (modified) (6 diffs)

branches/with_autoconf/src/sc_module.cc

@@ -49 +49 @@
 #include "sc_clock.h" // is_clock
 #include "entity.h"
-#include "assert.h"
+#include <cassert>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //
@@ -161 +164 @@
   sensitivity_list_t::iterator i;
   for (i = sensitivity_list.begin (); i != sensitivity_list.end (); ++i) {
-#if defined(_DEBUG)
+#if defined(CONFIG_DEBUG) && 0
     if (i->get_interface() == NULL)
     {
@@ -239 +242 @@
           sensitive (this)
 {
-  ASSERT(nm != NULL);
+  assert(nm != NULL);
 #if 0
   cerr << "sc_module constructor with const char * parameter\n";
@@ -499 +502 @@
   if (m_pushed == false)
     return;
-  ASSERT(sc_core::module_name_stack.empty () == false);
+  assert(sc_core::module_name_stack.empty () == false);
   sc_core::module_name_stack.pop_back ();
         modules_stack.pop ();
@@ -505 +508 @@
   cout << "~sc_module_name <- " << m_name << endl;
 #endif
-  ASSERT(temp_list.empty () == false);
+  assert(temp_list.empty () == false);
   sc_module *last1 = temp_list.back();
   temp_list.pop_back();
@@ -527 +530 @@
   if (m.dont_initialize == false)
   {
-    ASSERT(m.module != NULL);
-#if DEBUG
+    assert(m.module != NULL);
+#ifdef CONFIG_DEBUG
     std::cerr << "Warning : SystemCASS doesn't perform SC_METHOD(S) initializations.\n"
               << "Please turn off automatic initialization for '" << m.name