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

Timestamp:

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

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/sc_port.cc (modified) (8 diffs)

branches/with_autoconf/src/sc_port.cc

@@ -36 +36 @@
 
 
-#include<iomanip>
-#include<list>
-#include<map>
-#include<vector>
-
-#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 <list>
+#include <map>
+#include <vector>
+
+#include "sc_port.h"
+#include "sc_signal.h"
+#include "sc_module.h"
+#include "entity.h"
+#include "global_functions.h"
+#include <cassert>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 extern "C" {
@@ -56 +59 @@
 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;
@@ -110 +113 @@
 sc_port_base::init ()
 {
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (modules_stack.empty ()) {
                 cerr << "Internal error : modules stack empty\n";
@@ -235 +238 @@
 #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";
@@ -257 +260 @@
   cerr << "done.\n";
 #endif
-#if defined(CHECK_MULTIWRITING2REGISTER)
+#if defined(CONFIG_CHECK_MULTIWRITING2REGISTER)
   sc_core::pending_writing2register_clear ();
 #endif
@@ -312 +315 @@
 {
   const tab_t *pointer = port.get_pointer ();
-  //ASSERT(pointer != NULL);
+  //assert(pointer != NULL);
   if (pointer == NULL)
     return false; // case : sc_in not bound
@@ -345 +348 @@
   {
     /*const*/ sc_port_base *port = i->first;
-    ASSERT(port != NULL);
+    assert(port != NULL);
     check_port (*port);
   }
@@ -352 +355 @@
 }
 
-#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;