Don't use using of std::-types in headers.

Signed-off-by: Henner Zeller <[email protected]>

Author: hzeller

include/ord/OpenRoad.hh

@@ -126,8 +126,6 @@ class EstimateParasitics;
 
 namespace ord {
 
-using std::string;
-
 class dbVerilogNetwork;
 
 // Only pointers to components so the header has no dependents.
@@ -205,7 +203,7 @@ class OpenRoad
   void writeDef(const char* filename, const char* version);
   void writeDef(const char* filename,
                 // major.minor (avoid including defout.h)
-                const string& version);
+                const std::string& version);
 
   void writeCdl(const char* out_filename,
                 const std::vector<const char*>& masters_filenames,

src/OpenRoad.cc

@@ -355,7 +355,7 @@ void OpenRoad::readDef(const char* filename,
   def_reader.readChip(search_libs, filename, chip);
 }
 
-static odb::defout::Version stringToDefVersion(const string& version)
+static odb::defout::Version stringToDefVersion(const std::string& version)
 {
   if (version == "5.8") {
     return odb::defout::Version::DEF_5_8;
@@ -383,7 +383,7 @@ void OpenRoad::writeDef(const char* filename, const char* version)
   writeDef(filename, std::string(version));
 }
 
-void OpenRoad::writeDef(const char* filename, const string& version)
+void OpenRoad::writeDef(const char* filename, const std::string& version)
 {
   odb::dbChip* chip = db_->getChip();
   if (chip) {
@@ -443,7 +443,7 @@ void OpenRoad::writeLef(const char* filename)
       std::string name(filename);
       if (cnt > 0) {
         auto pos = name.rfind('.');
-        if (pos != string::npos) {
+        if (pos != std::string::npos) {
           name.insert(pos, "_" + std::to_string(cnt));
         } else {
           name += "_" + std::to_string(cnt);

src/rsz/src/BaseMove.hh

@@ -46,9 +46,6 @@ class EstimateParasitics;
 
 namespace rsz {
 
-using std::string;
-using std::vector;
-
 using odb::dbMaster;
 
 using odb::dbMaster;
@@ -234,7 +231,7 @@ class BaseMove : public sta::dbStaState
   static constexpr int buffer_removal_max_fanout_ = 10;
   static constexpr float rebuffer_relaxation_factor_ = 0.03;
 
-  vector<const Pin*> getFanouts(const Instance* inst);
+  std::vector<const Pin*> getFanouts(const Instance* inst);
 };
 
 }  // namespace rsz

src/rsz/src/BufferMove.hh

@@ -9,8 +9,6 @@ class EstimateParasitics;
 
 namespace rsz {
 
-using std::string;
-
 using sta::ArcDelay;
 using sta::Instance;
 using sta::InstancePinIterator;

src/rsz/src/CloneMove.hh

@@ -5,10 +5,6 @@
 
 namespace rsz {
 
-using std::pair;
-using std::string;
-using std::vector;
-
 using odb::Point;
 
 using sta::InstancePinIterator;

src/rsz/src/ConcreteSwapArithModules.cc

@@ -61,7 +61,7 @@ void ConcreteSwapArithModules::replaceArithModules(const int path_count,
 
   // Identify critical mod instances based on target, path_count and
   // slack_threshold
-  set<dbModInst*> arithInsts;
+  std::set<dbModInst*> arithInsts;
   findCriticalInstances(path_count, target, slack_threshold, arithInsts);
   if (arithInsts.empty()) {
     return;
@@ -75,7 +75,7 @@ void ConcreteSwapArithModules::findCriticalInstances(
     const int path_count,
     const std::string& target,
     const float slack_threshold,
-    set<dbModInst*>& insts)
+    std::set<dbModInst*>& insts)
 {
   logger_->info(RSZ,
                 152,
@@ -130,7 +130,7 @@ void ConcreteSwapArithModules::findCriticalInstances(
 
 void ConcreteSwapArithModules::collectArithInstsOnPath(
     const Path* path,
-    set<dbModInst*>& arithInsts)
+    std::set<dbModInst*>& arithInsts)
 {
   PathExpanded expanded(path, sta_);
   if (expanded.size() > 1) {
@@ -224,8 +224,9 @@ bool ConcreteSwapArithModules::hasArithOperatorProperty(
   return false;
 }
 
-void ConcreteSwapArithModules::doSwapInstances(const set<dbModInst*>& insts,
-                                               const std::string& target)
+void ConcreteSwapArithModules::doSwapInstances(
+    const std::set<dbModInst*>& insts,
+    const std::string& target)
 {
   int swapped_count = 0;
 

src/rsz/src/ConcreteSwapArithModules.hh

@@ -19,14 +19,14 @@ class ConcreteSwapArithModules : public SwapArithModules
                            const std::string& target,
                            float slack_threshold) override;
   void collectArithInstsOnPath(const Path* path,
-                               set<dbModInst*>& arithInsts) override;
+                               std::set<dbModInst*>& arithInsts) override;
   bool isArithInstance(const Instance* inst, dbModInst*& mod_inst) override;
   bool hasArithOperatorProperty(const dbModInst* mod_inst) override;
   void findCriticalInstances(int path_count,
                              const std::string& target,
                              float slack_threshold,
-                             set<dbModInst*>& insts) override;
-  void doSwapInstances(const set<dbModInst*>& insts,
+                             std::set<dbModInst*>& insts) override;
+  void doSwapInstances(const std::set<dbModInst*>& insts,
                        const std::string& target) override;
 
  protected:

src/rsz/src/SizeDownMove.hh

@@ -5,8 +5,6 @@
 
 namespace rsz {
 
-using std::string;
-
 using sta::ArcDelay;
 using sta::InstancePinIterator;
 using sta::LoadPinIndexMap;

src/rsz/src/SplitLoadMove.hh

@@ -5,8 +5,6 @@
 
 namespace rsz {
 
-using std::string;
-
 using sta::ArcDelay;
 using sta::InstancePinIterator;
 using sta::LoadPinIndexMap;

src/rsz/src/SwapArithModules.hh

@@ -38,7 +38,6 @@ class Resizer;
 using odb::dbModInst;
 using sta::Instance;
 using sta::Path;
-using std::set;
 using utl::Logger;
 
 class SwapArithModules : public sta::dbStaState
@@ -52,16 +51,16 @@ class SwapArithModules : public sta::dbStaState
                                    float slack_threshold)
       = 0;
   virtual void collectArithInstsOnPath(const Path* path,
-                                       set<dbModInst*>& arithInsts)
+                                       std::set<dbModInst*>& arithInsts)
       = 0;
   virtual bool isArithInstance(const Instance* inst, dbModInst*& mod_inst) = 0;
   virtual bool hasArithOperatorProperty(const dbModInst* mod_inst) = 0;
   virtual void findCriticalInstances(int path_count,
                                      const std::string& target,
                                      float slack_threshold,
-                                     set<dbModInst*>& insts)
+                                     std::set<dbModInst*>& insts)
       = 0;
-  virtual void doSwapInstances(const set<dbModInst*>& insts,
+  virtual void doSwapInstances(const std::set<dbModInst*>& insts,
                                const std::string& target)
       = 0;