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

Timestamp:

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

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/sc_trace.cc (modified) (10 diffs)

branches/with_autoconf/src/sc_trace.cc

@@ -41 +41 @@
 #include "bit2string.h"
 #include "hex2string.h"
-#include "assert.h"
+#include <cassert>
 
 #include <list>
 #include <stdio.h>
 #include <iostream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //-----------------------------------------
@@ -52 +55 @@
 
 //-----------------------------------------
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 
 extern "C" {
@@ -62 +65 @@
 #include <stdio.h>
 
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 //-----------------------------------------
 
@@ -164 +167 @@
     {
       sc_trace_file *tf = *ptf;
-      ASSERT(tf != NULL);
+      assert(tf != NULL);
                 trace (*tf, part);
     }
@@ -172 +175 @@
 }
 
-#if PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 static void
 pat_set_value (char *buf, const signal2trace &s)
@@ -282 +285 @@
 {
 }
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 
 static
@@ -413 +416 @@
   else
     vcd_signal_table = (tab_t*) malloc (sizeof (tab_t) * size);
-#if DEBUG
+#ifdef CONFIG_DEBUG
   if (vcd_signal_table == NULL)
   {
@@ -485 +488 @@
       vcd_trace_init (tf);
   } else {
-#if defined(DEBUG)
+#if defined(CONFIG_DEBUG)
       if (vcd_signal_table == NULL)
       {
@@ -579 +582 @@
 &name)
 {
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
         //exemple:
         //DECLAR ("a", ":2", "X", IN, "3  downto 0", "" );
@@ -629 +632 @@
 #endif
         DECLAR ((char*)(name.c_str ()), ":1", format, dir,(char *) downto.c_str(), "" );
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 }