Changes in sources/src/sc_module.cc [27:12]

File:

• sources/src/sc_module.cc (modified) (6 diffs)

sources/src/sc_module.cc

@@ -48 +48 @@
 #include "sc_clock.h" // is_clock
 #include "entity.h"
-#include <cassert>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "assert.h"
 
 //
@@ -163 +160 @@
   sensitivity_list_t::iterator i;
   for (i = sensitivity_list.begin (); i != sensitivity_list.end (); ++i) {
-#if defined(CONFIG_DEBUG) && 0
+#if defined(_DEBUG)
     if (i->get_interface() == NULL)
     {
@@ -241 +238 @@
           sensitive (this)
 {
-  assert(nm != NULL);
+  ASSERT(nm != NULL);
 #if 0
   cerr << "sc_module constructor with const char * parameter\n";
@@ -501 +498 @@
   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 ();
@@ -507 +504 @@
   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();
@@ -529 +526 @@
   if (m.dont_initialize == false)
   {
-    assert(m.module != NULL);
-#ifdef CONFIG_DEBUG
+    ASSERT(m.module != NULL);
+#if DEBUG
     std::cerr << "Warning : SystemCASS doesn't perform SC_METHOD(S) initializations.\n"
               << "Please turn off automatic initialization for '" << m.name