diff --git a/include/sta/PathGroup.hh b/include/sta/PathGroup.hh index a3bd6ee3..836804f7 100644 --- a/include/sta/PathGroup.hh +++ b/include/sta/PathGroup.hh @@ -32,6 +32,7 @@ #include "SdcClass.hh" #include "StaState.hh" #include "SearchClass.hh" +#include "StringUtil.hh" namespace sta { @@ -42,7 +43,6 @@ using PathGroupIterator = PathEndSeq::iterator; using PathGroupClkMap = std::map; using PathGroupNamedMap = std::map; using PathGroupSeq = std::vector; -using StdStringSeq = std::vector; // A collection of PathEnds grouped and sorted for reporting. class PathGroup diff --git a/include/sta/Search.hh b/include/sta/Search.hh index 09bc1687..4c98845c 100644 --- a/include/sta/Search.hh +++ b/include/sta/Search.hh @@ -40,6 +40,7 @@ #include "SearchPred.hh" #include "VertexVisitor.hh" #include "Path.hh" +#include "StringUtil.hh" namespace sta { @@ -70,7 +71,6 @@ using VertexSlackMapSeq = std::vector; using WorstSlacksSeq = std::vector; using DelayDblSeq = std::vector; using ExceptionPathSeq = std::vector; -using StdStringSeq = std::vector; class Search : public StaState { diff --git a/include/sta/Sta.hh b/include/sta/Sta.hh index 15df9a85..ddb2f7d7 100644 --- a/include/sta/Sta.hh +++ b/include/sta/Sta.hh @@ -30,6 +30,7 @@ #include #include "StringSeq.hh" +#include "StringUtil.hh" #include "LibertyClass.hh" #include "NetworkClass.hh" #include "SdcClass.hh" @@ -80,7 +81,6 @@ using SceneNameMap = std::map; using SlowDrvrIterator = Iterator; using CheckError = StringSeq; using CheckErrorSeq = std::vector; -using StdStringSeq = std::vector; enum class CmdNamespace { sta, sdc }; using ParasiticsNameMap = std::map; // Path::slack/arrival/required function. diff --git a/include/sta/StringSeq.hh b/include/sta/StringSeq.hh index ca7c304f..9821b7b2 100644 --- a/include/sta/StringSeq.hh +++ b/include/sta/StringSeq.hh @@ -31,7 +31,6 @@ namespace sta { using StringSeq = std::vector; -using StdStringSeq = std::vector; void deleteContents(StringSeq *strings); diff --git a/include/sta/StringSet.hh b/include/sta/StringSet.hh index 36fa7e67..fc3d0d2b 100644 --- a/include/sta/StringSet.hh +++ b/include/sta/StringSet.hh @@ -31,7 +31,6 @@ namespace sta { using StringSet = std::set; using StdStringSet = std::set; -using StdStringSeq = std::vector; void deleteContents(StringSet *strings); diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh index 91fdf260..c17cdeb8 100644 --- a/liberty/LibertyReaderPvt.hh +++ b/liberty/LibertyReaderPvt.hh @@ -31,6 +31,7 @@ #include #include "StringSeq.hh" +#include "StringUtil.hh" #include "MinMax.hh" #include "NetworkClass.hh" #include "Transition.hh" @@ -55,7 +56,6 @@ class OutputWaveform; using LibraryGroupVisitor = void (LibertyReader::*)(const LibertyGroup *group, LibertyGroup *parent_group); using LibraryGroupVisitorMap = std::unordered_map; -using StdStringSeq = std::vector; using LibertyPortGroupMap = std::map; using OutputWaveformSeq = std::vector; diff --git a/spice/WriteSpice.hh b/spice/WriteSpice.hh index aee55dfe..81bd15b7 100644 --- a/spice/WriteSpice.hh +++ b/spice/WriteSpice.hh @@ -31,6 +31,7 @@ #include "StaState.hh" #include "StringSet.hh" +#include "StringUtil.hh" #include "Liberty.hh" #include "GraphClass.hh" #include "Parasitics.hh" @@ -40,7 +41,6 @@ namespace sta { using ParasiticNodeMap = std::map; -using StdStringSeq = std::vector; using CellSpicePortNames = std::map; using LibertyPortLogicValues = std::map; diff --git a/spice/Xyce.hh b/spice/Xyce.hh index 1c27cb4e..ce8e5e6c 100644 --- a/spice/Xyce.hh +++ b/spice/Xyce.hh @@ -27,11 +27,11 @@ #include #include +#include "StringUtil.hh" #include "TableModel.hh" namespace sta { -using StdStringSeq = std::vector; using WaveformSeq = std::vector; void diff --git a/verilog/VerilogReaderPvt.hh b/verilog/VerilogReaderPvt.hh index 60498c7d..6bbe8288 100644 --- a/verilog/VerilogReaderPvt.hh +++ b/verilog/VerilogReaderPvt.hh @@ -29,12 +29,12 @@ #include #include "StringSeq.hh" +#include "StringUtil.hh" namespace sta { using VerilogDclMap = std::map; using VerilogConstantValue = std::vector; -using StdStringSeq = std::vector; class VerilogStmt {