From 2ce82bd1876dac7622e2a1383580c336b89d0255 Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Sat, 18 Jul 2020 19:54:10 -0700
Subject: [PATCH] include Machine.hh in headers that use __attribute__

---
 app/StaMain.cc                   | 1 -
 include/sta/Debug.hh             | 1 +
 {util => include/sta}/Machine.hh | 0
 include/sta/Report.hh            | 1 +
 include/sta/Sta.hh               | 1 +
 include/sta/StringUtil.hh        | 1 +
 include/sta/TimingArc.hh         | 1 +
 liberty/LibertyReaderPvt.hh      | 1 +
 parasitics/SpefReaderPvt.hh      | 1 +
 search/Sta.cc                    | 1 -
 tcl/StaTcl.i                     | 1 -
 util/Report.cc                   | 1 -
 util/Stats.cc                    | 2 +-
 util/StringUtil.cc               | 2 +-
 14 files changed, 9 insertions(+), 6 deletions(-)
 rename {util => include/sta}/Machine.hh (100%)

diff --git a/app/StaMain.cc b/app/StaMain.cc
index 88d5821d..aaed624a 100644
--- a/app/StaMain.cc
+++ b/app/StaMain.cc
@@ -19,7 +19,6 @@
 #include <tcl.h>
 #include <stdlib.h>
 
-#include "util/Machine.hh"
 #include "StringUtil.hh"
 #include "Vector.hh"
 #include "Sta.hh"
diff --git a/include/sta/Debug.hh b/include/sta/Debug.hh
index eb70468a..22c57794 100644
--- a/include/sta/Debug.hh
+++ b/include/sta/Debug.hh
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <stdarg.h>
+#include "Machine.hh"
 #include "DisallowCopyAssign.hh"
 #include "Map.hh"
 #include "StringUtil.hh"
diff --git a/util/Machine.hh b/include/sta/Machine.hh
similarity index 100%
rename from util/Machine.hh
rename to include/sta/Machine.hh
diff --git a/include/sta/Report.hh b/include/sta/Report.hh
index 6dd0ca47..df45765d 100644
--- a/include/sta/Report.hh
+++ b/include/sta/Report.hh
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <string>
 #include <mutex>
+#include "Machine.hh"
 #include "DisallowCopyAssign.hh"
 
 struct Tcl_Interp;
diff --git a/include/sta/Sta.hh b/include/sta/Sta.hh
index 3c0a3377..e8b23756 100644
--- a/include/sta/Sta.hh
+++ b/include/sta/Sta.hh
@@ -18,6 +18,7 @@
 
 #include <string>
 
+#include "Machine.hh"
 #include "DisallowCopyAssign.hh"
 #include "StringSeq.hh"
 #include "LibertyClass.hh"
diff --git a/include/sta/StringUtil.hh b/include/sta/StringUtil.hh
index 5cfc650a..d06eef34 100644
--- a/include/sta/StringUtil.hh
+++ b/include/sta/StringUtil.hh
@@ -19,6 +19,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <string>
+#include "Machine.hh"
 #include "Vector.hh"
 
 namespace sta {
diff --git a/include/sta/TimingArc.hh b/include/sta/TimingArc.hh
index ce1a2fc9..00cea66b 100644
--- a/include/sta/TimingArc.hh
+++ b/include/sta/TimingArc.hh
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include "Machine.hh"
 #include "DisallowCopyAssign.hh"
 #include "Vector.hh"
 #include "Transition.hh"
diff --git a/liberty/LibertyReaderPvt.hh b/liberty/LibertyReaderPvt.hh
index 2a356a61..26dffdcc 100644
--- a/liberty/LibertyReaderPvt.hh
+++ b/liberty/LibertyReaderPvt.hh
@@ -18,6 +18,7 @@
 
 #include <functional>
 
+#include "Machine.hh"
 #include "DisallowCopyAssign.hh"
 #include "Vector.hh"
 #include "Map.hh"
diff --git a/parasitics/SpefReaderPvt.hh b/parasitics/SpefReaderPvt.hh
index 3008230a..41a9cfd6 100644
--- a/parasitics/SpefReaderPvt.hh
+++ b/parasitics/SpefReaderPvt.hh
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include "Machine.hh"
 #include "Zlib.hh"
 #include "Map.hh"
 #include "StringSeq.hh"
diff --git a/search/Sta.cc b/search/Sta.cc
index 10a76a1b..dbba27fc 100644
--- a/search/Sta.cc
+++ b/search/Sta.cc
@@ -16,7 +16,6 @@
 
 #include "Sta.hh"
 
-#include "util/Machine.hh"
 #include "DispatchQueue.hh"
 #include "ReportTcl.hh"
 #include "Debug.hh"
diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i
index 45318431..00b46b43 100644
--- a/tcl/StaTcl.i
+++ b/tcl/StaTcl.i
@@ -73,7 +73,6 @@
 #include "WritePathSpice.hh"
 #include "Search.hh"
 #include "Sta.hh"
-#include "util/Machine.hh"
 #include "search/Tag.hh"
 #include "search/CheckTiming.hh"
 #include "search/CheckMinPulseWidths.hh"
diff --git a/util/Report.cc b/util/Report.cc
index 0d8d07eb..fea3d287 100644
--- a/util/Report.cc
+++ b/util/Report.cc
@@ -19,7 +19,6 @@
 #include <algorithm> // min
 
 #include "Error.hh"
-#include "Machine.hh"
 
 namespace sta {
 
diff --git a/util/Stats.cc b/util/Stats.cc
index 5b647f63..d27f89f0 100644
--- a/util/Stats.cc
+++ b/util/Stats.cc
@@ -16,9 +16,9 @@
 
 #include "Stats.hh"
 
+#include "Machine.hh"
 #include "StringUtil.hh"
 #include "Debug.hh"
-#include "Machine.hh"
 
 namespace sta {
 
diff --git a/util/StringUtil.cc b/util/StringUtil.cc
index 151b9a08..95f8d13e 100644
--- a/util/StringUtil.cc
+++ b/util/StringUtil.cc
@@ -20,8 +20,8 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "Mutex.hh"
 #include "Machine.hh"
+#include "Mutex.hh"
 
 namespace sta {