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

File:

• sources/src/sc_port.cc (modified) (8 diffs)

sources/src/sc_port.cc

@@ -36 +36 @@
 
 
-#include <iomanip>
-#include <map>
-#include <cassert>
-
-#include "sc_port.h"
-#include "sc_signal.h"
-#include "sc_module.h"
-#include "entity.h"
-#include "global_functions.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include<iomanip>
+#include<map>
+
+#include"sc_port.h"
+#include"sc_signal.h"
+#include"sc_module.h"
+#include"entity.h"
+#include"global_functions.h"
+#include"assert.h"
 
 extern "C" {
@@ -58 +54 @@
 using namespace std;
 
-#ifdef CONFIG_CHECK_FSM_RULES
-#include "fsm_rules.h"
+#ifdef CHECK_FSM_RULES
+#include"fsm_rules.h"
 namespace sc_core {
 casc_fsm_step_t casc_fsm_step = ELABORATION;
@@ -112 +108 @@
 sc_port_base::init ()
 {
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
         if (modules_stack.empty ()) {
                 cerr << "Internal error : modules stack empty\n";
@@ -237 +233 @@
 #endif
 #define iter (sc_core::pending_write_vector[i])
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
                 if (iter.pointer == NULL) {
                         cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
@@ -259 +255 @@
   cerr << "done.\n";
 #endif
-#if defined(CONFIG_CHECK_MULTIWRITING2REGISTER)
+#if defined(CHECK_MULTIWRITING2REGISTER)
   sc_core::pending_writing2register_clear ();
 #endif
@@ -314 +310 @@
 {
   const tab_t *pointer = port.get_pointer ();
-  //assert(pointer != NULL);
+  //ASSERT(pointer != NULL);
   if (pointer == NULL)
     return false; // case : sc_in not bound
@@ -347 +343 @@
   {
     /*const*/ sc_port_base *port = i->first;
-    assert(port != NULL);
+    ASSERT(port != NULL);
     check_port (*port);
   }
@@ -354 +350 @@
 }
 
-#if defined(CONFIG_CHECK_MULTIWRITING2REGISTER)
+#if defined(CHECK_MULTIWRITING2REGISTER)
 typedef set<const tab_t*> pending_writing2register_set_t;
 pending_writing2register_set_t pending_writing2register_set;