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

Timestamp:

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

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/serialization.cc (modified) (5 diffs)

branches/with_autoconf/src/serialization.cc

@@ -35 +35 @@
 
 
-#include<vector>
-#include<map>
-#include<fstream> // save_module_hierarchy
-#include"internal_ext.h" // tab_t
-#include"serialization.h"
-#include"entity.h"
-#include"sc_module.h"
-#include"sc_object.h"
-#include"hex2string.h"
-#include"assert.h"
+#include <vector>
+#include <map>
+#include <fstream> // save_module_hierarchy
+#include "internal_ext.h" // tab_t
+#include "serialization.h"
+#include "entity.h"
+#include "sc_module.h"
+#include "sc_object.h"
+#include "hex2string.h"
+#include <cassert>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -83 +86 @@
             int          bit_number)
 {
-  ASSERT(bit_number <= 64);
+  assert(bit_number <= 64);
   if (bit_number == 1) {
     bool v = *((const bool*) val);
@@ -139 +142 @@
                     save_fct_t1      fct)
 {
-  //ASSERT(fct != NULL);
+  //assert(fct != NULL);
   //sc_module2save_fct_t1::value_type pair(&mod,fct);
   //save_handler_table.insert (pair);
@@ -157 +160 @@
     const sc_module *mod = it->first;
     save_fct_t1      fct = it->second;
-    ASSERT(mod != NULL);
-//    ASSERT(fct != NULL);
+    assert(mod != NULL);
+//    assert(fct != NULL);
     //o << mod->name () << endl;
     fprintf (o,"module\n%s\n",mod->name ());
@@ -184 +187 @@
   file.close ();
   FILE *f = fopen (filename, "a+");
-  ASSERT(f != NULL);
+  assert(f != NULL);
   save_modules (f);
   fclose (f);