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

File:

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

sources/src/sc_port.cc

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