mpl util.h: use less ambiguous name.

The "util.h" has a very generic name and it is included not
relative to project root, but relative to current files, so relies
on the include search path.

Make this a more unique name and use mpl-util.h instead.

While at it, fix another "util.h" ambiguity in the rcx
header directory. Here, we can dismabiguate by adding the "rcx/"
prefix as it should be.

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

Author: hzeller

src/mpl/BUILD

@@ -28,7 +28,7 @@ cc_library(
         "src/rtl_mp.cpp",
         "src/shapes.cpp",
         "src/shapes.h",
-        "src/util.h",
+        "src/mpl-util.h",
     ],
     hdrs = [
         "include/mpl/rtl_mp.h",
@@ -57,7 +57,7 @@ cc_library(
         "src/graphics.h",
         "src/object.h",
         "src/shapes.h",
-        "src/util.h",
+        "src/mpl-util.h",
         ":swig",
         ":tcl",
     ],

src/mpl/src/MplObserver.h

@@ -7,9 +7,9 @@
 #include <vector>
 
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/geom.h"
-#include "util.h"
 
 namespace mpl {
 

src/mpl/src/SACoreHardMacro.cpp

@@ -9,9 +9,9 @@
 #include "MplObserver.h"
 #include "SimulatedAnnealingCore.h"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {

src/mpl/src/SACoreHardMacro.h

@@ -8,9 +8,9 @@
 #include "MplObserver.h"
 #include "SimulatedAnnealingCore.h"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 
 namespace utl {
 class Logger;

src/mpl/src/SACoreSoftMacro.cpp

@@ -15,9 +15,9 @@
 #include "SimulatedAnnealingCore.h"
 #include "boost/random/uniform_int_distribution.hpp"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {

src/mpl/src/SACoreSoftMacro.h

@@ -9,9 +9,9 @@
 #include "MplObserver.h"
 #include "SimulatedAnnealingCore.h"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 
 namespace utl {
 class Logger;

src/mpl/src/SimulatedAnnealingCore.cpp

@@ -17,10 +17,10 @@
 #include "MplObserver.h"
 #include "boost/random/uniform_int_distribution.hpp"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
 #include "odb/geom.h"
-#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {

src/mpl/src/SimulatedAnnealingCore.h

@@ -11,9 +11,9 @@
 
 #include "MplObserver.h"
 #include "clusterEngine.h"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 
 namespace utl {
 class Logger;

src/mpl/src/clusterEngine.cpp

@@ -14,13 +14,13 @@
 
 #include "MplObserver.h"
 #include "db_sta/dbNetwork.hh"
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
 #include "odb/dbTypes.h"
 #include "odb/geom.h"
 #include "par/PartitionMgr.h"
 #include "sta/Liberty.hh"
-#include "util.h"
 #include "utl/Logger.h"
 
 namespace mpl {

src/mpl/src/clusterEngine.h

@@ -12,9 +12,9 @@
 #include <utility>
 #include <vector>
 
+#include "mpl-util.h"
 #include "object.h"
 #include "odb/db.h"
-#include "util.h"
 
 namespace par {
 class PartitionMgr;