Merge branch 'master' into sta_update_upstream_lvf_stuff

power/test/cpp/TestPower.cc

@@ -768,8 +768,7 @@ TEST_F(PowerDesignTest, PowerPerInstance) {
   InstanceChildIterator *child_iter = network->childIterator(top);
   int count = 0;
   while (child_iter->hasNext() && count < 5) {
-    Instance *inst = child_iter->next();
-    PowerResult result = sta_->power(inst, corner);
+    sta_->power(child_iter->next(), corner);
     count++;
   }
   delete child_iter;

sdc/test/cpp/TestSdcClasses.cc

@@ -35,31 +35,6 @@
 
 namespace sta {
 
-static std::string
-readTextFile(const char *filename)
-{
-  std::ifstream in(filename);
-  if (!in.is_open())
-    return "";
-  return std::string((std::istreambuf_iterator<char>(in)),
-                     std::istreambuf_iterator<char>());
-}
-
-static size_t
-countSubstring(const std::string &text,
-               const std::string &needle)
-{
-  if (needle.empty())
-    return 0;
-  size_t count = 0;
-  size_t pos = 0;
-  while ((pos = text.find(needle, pos)) != std::string::npos) {
-    ++count;
-    pos += needle.size();
-  }
-  return count;
-}
-
 // RiseFall tests
 class RiseFallTest : public ::testing::Test {};