From: Gabe Black <gabeblack@google.com>
Date: Thu, 3 Jan 2019 22:30:14 +0000 (-0800)
Subject: systemc: Stop using the sc_string_view type.
X-Git-Tag: v19.0.0.0~1295
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de51d7c4e784416f993cc192c96b2a6ca98d838a;p=gem5.git

systemc: Stop using the sc_string_view type.

It doesn't seem to provide anything more that std::string, and comes
with extra dependencies/baggage.

Change-Id: I2c599bcc93fa4a944ff249410d24e8f8be981afe
Reviewed-on: https://gem5-review.googlesource.com/c/15298
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
---

diff --git a/src/systemc/tlm_core/2/generic_payload/phase.cc b/src/systemc/tlm_core/2/generic_payload/phase.cc
index a3fb93749..8f9172296 100644
--- a/src/systemc/tlm_core/2/generic_payload/phase.cc
+++ b/src/systemc/tlm_core/2/generic_payload/phase.cc
@@ -19,12 +19,11 @@
 
 #include <cstring>
 #include <map>
+#include <string>
 #include <systemc>
 #include <tlm>
 #include <typeindex>
 
-using sc_core::sc_string_view;
-
 namespace tlm
 {
 
@@ -43,7 +42,7 @@ struct tlm_phase_registry
     }
 
     unsigned int
-    register_phase(std::type_index type, sc_string_view name)
+    register_phase(std::type_index type, std::string name)
     {
         type_map::const_iterator it = ids_.find(type);