Changes in sources/src/entity.cc [27:17]

File:

• sources/src/entity.cc (modified) (13 diffs)

sources/src/entity.cc

@@ -35 +35 @@
  */
 
-#include <cstring>
-#include <iomanip>
-#include <list>
-#include <map>
-#include <vector>
-
-#include <cassert>
-#include "entity.h"
-#include "sc_port.h"
-#include "sc_signal.h"
-#include "sc_module.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include<cstring>
+#include<iomanip>
+#include<list>
+#include<map>
+#include<vector>
+
+#include"assert.h"
+#include"entity.h"
+#include"sc_port.h"
+#include"sc_signal.h"
+#include"sc_module.h"
 
 using namespace std;
@@ -178 +175 @@
     typedef std::map<const tab_t *,equi_list_t::iterator,predic4tab_t2equi_t_t> tab_t2equi_it_t;
     static tab_t2equi_it_t tab2equi_map;
-    assert(pointer != NULL);
+    ASSERT(pointer != NULL);
 
     // boost
@@ -243 +240 @@
         {
                 equi_t::const_iterator top_iter = e.begin ();
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
                 if (top_iter == e.end ()) {
                         cerr << "Internal error : no signal in " << e << endl;
@@ -360 +357 @@
         }
         
-#if defined(DUMP_SIGNAL_STATS)
+#if defined(DUMP_SIGNALS_STATS)
         static unsigned int equi_real_size;
 #endif
@@ -392 +389 @@
     unsigned int table_size = get_sizeof_signals_table ();
                 equi_table = new tab_t[table_size]; //(0xCD);
-#if defined(DUMP_SIGNAL_STATS)
+#if defined(DUMP_SIGNALS_STATS)
                 equi_real_size = table_size;
 #endif
@@ -406 +403 @@
   bind_equi_to_table (equi_t &e, tab_t * const pointer)
   {
-    assert(pointer != NULL);
+    ASSERT(pointer != NULL);
     equi_t::iterator i;
     for (i = e.begin (); i != e.end (); ++i) {
@@ -458 +455 @@
     o << ")";
 #else
-   assert(e.object != NULL); 
+   ASSERT(e.object != NULL); 
    o << e.object->name ();
 #endif
@@ -497 +494 @@
   print_table_stats (ostream &o)
   {
-#if defined(DUMP_SIGNAL_STATS)
+#if defined(DUMP_SIGNALS_STATS)
                 int nb_reg = 0;
                 int nb_sig = 0;
@@ -540 +537 @@
         }
         const entity &ent = *(eq.begin ());
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
         if (ent.type != sc_core::entity::SIGNAL)
                 exit(28);
@@ -547 +544 @@
         const char *sig_name = ent.object->name ();
         const char *sep  = strchr (sig_name,'.');
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
         if (sep == NULL) {
                 exit (30);
@@ -598 +595 @@
 #endif
 
-#if defined(DUMP_SIGNAL_STATS)
+#if defined(DUMP_SIGNALS_STATS)
 static unsigned int equi_real_size;
 #endif
@@ -606 +603 @@
 {
 #if 0 
-//defined(CONFIG_DEBUG)
+//defined(DEBUG)
   equi_list_t::iterator x_equi = get_equi (x);
   if ((x_equi != equi_list.end())) {
@@ -643 +640 @@
 tbind (sc_port_base &x,T &y)
 {
-//  assert(x.get_pointer () != NULL); // x pointer may be NULL
-//  assert(y.get_pointer () != NULL); // y pointer may be NULL
+//  ASSERT(x.get_pointer () != NULL); // x pointer may be NULL
+//  ASSERT(y.get_pointer () != NULL); // y pointer may be NULL
   equi_list_t::iterator x_equi = get_equi (x);
   equi_list_t::iterator y_equi = get_equi (y);