systemc: Stop using the sc_string_view type.

[gem5.git] / src / systemc / core / sc_spawn.cc

diff --git a/src/systemc/core/sc_spawn.cc b/src/systemc/core/sc_spawn.cc
index ed7f2f22b524a8d6808a47128ee8f5f59531dc06..5e6d89d13e7b05e88519fa2e085b9aa48ca52533 100644 (file)
--- a/src/systemc/core/sc_spawn.cc
+++ b/src/systemc/core/sc_spawn.cc
@@ -31,6 +31,11 @@
 #include "systemc/core/process.hh"
 #include "systemc/core/process_types.hh"
 #include "systemc/core/scheduler.hh"
+#include "systemc/ext/channel/sc_in.hh"
+#include "systemc/ext/channel/sc_inout.hh"
+#include "systemc/ext/channel/sc_out.hh"
+#include "systemc/ext/channel/sc_signal_in_if.hh"
+#include "systemc/ext/core/messages.hh"
 #include "systemc/ext/core/sc_main.hh"
 #include "systemc/ext/core/sc_module.hh"
 #include "systemc/ext/core/sc_spawn.hh"
@@ -85,25 +90,23 @@ spawnWork(ProcessFuncWrapper *func, const char *name,
             newStaticSensitivityFinder(proc, f);
 
         for (auto p: opts->_in_resets)
-            newResetSensitivityPort(proc, p.target, p.value, p.sync);
+            newReset(p.target, proc, p.sync, p.value);
 
         for (auto p: opts->_inout_resets)
-            newResetSensitivityPort(proc, p.target, p.value, p.sync);
+            newReset(p.target, proc, p.sync, p.value);
 
         for (auto p: opts->_out_resets)
-            newResetSensitivityPort(proc, p.target, p.value, p.sync);
+            newReset(p.target, proc, p.sync, p.value);
 
         for (auto i: opts->_if_resets)
-            newResetSensitivitySignal(proc, i.target, i.value, i.sync);
+            newReset(i.target, proc, i.sync, i.value);
     }
 
     if (opts && opts->_dontInitialize &&
             opts->_events.empty() && opts->_ports.empty() &&
             opts->_exports.empty() && opts->_interfaces.empty() &&
             opts->_finders.empty()) {
-        SC_REPORT_WARNING(
-                "(W558) disable() or dont_initialize() called on process "
-                "with no static sensitivity, it will be orphaned",
+        SC_REPORT_WARNING(sc_core::SC_ID_DISABLE_WILL_ORPHAN_PROCESS_,
                 proc->name());
     }