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

File:

• sources/src/sc_trace.cc (modified) (11 diffs)

sources/src/sc_trace.cc

@@ -41 +41 @@
 #include "bit2string.h"
 #include "hex2string.h"
-
-#include <cassert>
+#include "assert.h"
+
 #include <list>
 #include <cstdio>
@@ -48 +48 @@
 #include <cstring> //strlen
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 //-----------------------------------------
 
@@ -57 +53 @@
 
 //-----------------------------------------
-#ifdef CONFIG_PAT_TRACE_FORMAT
+#ifdef PAT_TRACE_FORMAT
 
 extern "C" {
@@ -67 +63 @@
 #include <cstdio>
 
-#endif // CONFIG_PAT_TRACE_FORMAT
+#endif // PAT_TRACE_FORMAT
 //-----------------------------------------
 
@@ -169 +165 @@
     {
       sc_trace_file *tf = *ptf;
-      assert(tf != NULL);
+      ASSERT(tf != NULL);
                 trace (*tf, part);
     }
@@ -177 +173 @@
 }
 
-#ifdef CONFIG_PAT_TRACE_FORMAT
+#if PAT_TRACE_FORMAT
 static void
 pat_set_value (char *buf, const signal2trace &s)
@@ -287 +283 @@
 {
 }
-#endif // CONFIG_PAT_TRACE_FORMAT
+#endif // PAT_TRACE_FORMAT
 
 static
@@ -418 +414 @@
   else
     vcd_signal_table = (tab_t*) malloc (sizeof (tab_t) * size);
-#ifdef CONFIG_DEBUG
+#if DEBUG
   if (vcd_signal_table == NULL)
   {
@@ -490 +486 @@
       vcd_trace_init (tf);
   } else {
-#if defined(CONFIG_DEBUG)
+#if defined(DEBUG)
       if (vcd_signal_table == NULL)
       {
@@ -584 +580 @@
 &name)
 {
-#ifdef CONFIG_PAT_TRACE_FORMAT
+#ifdef PAT_TRACE_FORMAT
         //exemple:
         //DECLAR ("a", ":2", "X", IN, "3  downto 0", "" );
@@ -634 +630 @@
 #endif
         DECLAR ((char*)(name.c_str ()), ":1", format, dir,(char *) downto.c_str(), "" );
-#endif // CONFIG_PAT_TRACE_FORMAT
+#endif // PAT_TRACE_FORMAT
 }