Added proper guards to new files.

alanminko · alanminko · commit a38d012563fa · 2025-12-24T19:47:46.000-08:00
diff --git a/src/opt/ufar/UfarCmd.cpp b/src/opt/ufar/UfarCmd.cpp
@@ -16,6 +16,8 @@
 #include <climits>
 #include <regex>
 
+ABC_NAMESPACE_IMPL_START
+
 using namespace std;
 
 static UFAR::UfarManager ufar_manager;
@@ -333,4 +335,4 @@ static int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
 #endif
 }
 
-
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/ufar/UfarCmd.h b/src/opt/ufar/UfarCmd.h
@@ -10,14 +10,10 @@
 
 #include "base/main/mainInt.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+ABC_NAMESPACE_HEADER_START
 
 void Ufar_Init(Abc_Frame_t *pAbc);
 
-#ifdef __cplusplus
-}
-#endif
+ABC_NAMESPACE_HEADER_END
 
 #endif /* SRC_EXT2_UIF_UIFCMD_H_ */
diff --git a/src/opt/ufar/UfarMgr.cpp b/src/opt/ufar/UfarMgr.cpp
@@ -16,6 +16,8 @@
 #include <sat/cnf/cnf.h>
 #include <aig/gia/giaAig.h>
 
+ABC_NAMESPACE_IMPL_START
+
 extern "C" {
     Abc_Ntk_t * Abc_NtkFromAigPhase( Aig_Man_t * pMan );
     void Wlc_NtkSimulatePrint( Wlc_Ntk_t * p, Vec_Int_t * vNodes, Vec_Ptr_t * vRes, int nWords, int nFrames );
@@ -1661,3 +1663,5 @@ void UfarManager::_read_states(const std::string &file) {
 }
 
 }
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/ufar/UfarMgr.h b/src/opt/ufar/UfarMgr.h
@@ -17,10 +17,14 @@
 #include <memory>
 #include <sys/time.h>
 
+#include "misc/util/abc_namespaces.h"
+
 typedef struct Wlc_Ntk_t_ Wlc_Ntk_t;
 typedef struct Abc_Cex_t_ Abc_Cex_t;
 typedef struct Gia_Man_t_ Gia_Man_t;
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 namespace UFAR {
 
 using VecVecInt = std::vector<std::vector<int> >;
@@ -141,4 +145,6 @@ class UfarManager {
 
 }
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif /* SRC_EXT2_UIF_UIFMGR_H_ */
diff --git a/src/opt/ufar/UfarPth.cpp b/src/opt/ufar/UfarPth.cpp
@@ -5,9 +5,13 @@
 #include "proof/pdr/pdr.h"
 #include "aig/gia/giaAig.h"
 
+#include "misc/util/abc_namespaces.h"
+
 #include <pthread.h>
 #include <unistd.h>
 
+ABC_NAMESPACE_IMPL_START
+
 extern "C" {
     Abc_Ntk_t *   Abc_NtkFromAigPhase( Aig_Man_t * pAig );
     int           Abc_NtkDarBmc3( Abc_Ntk_t * pAbcNtk, Saig_ParBmc_t * pBmcPars, int fOrDecomp );
@@ -287,3 +291,5 @@ int RunConcurrentSolver( Wlc_Ntk_t * pNtk, const vector<string>& vSolvers, Abc_C
 
 
 }
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/ufar/UfarPth.h b/src/opt/ufar/UfarPth.h
@@ -9,9 +9,13 @@
 #include <vector>
 #include <string>
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 namespace UFAR
 {
     int RunConcurrentSolver( Wlc_Ntk_t * pNtk, const std::vector<std::string>& vSolvers, Abc_Cex_t ** ppCex, struct timespec * timeout );
 }
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif //SRC_EXT2_UFAR_PTH_H
diff --git a/src/opt/untk/Netlist.cpp b/src/opt/untk/Netlist.cpp
@@ -8,6 +8,8 @@
 
 #include <iostream>
 
+ABC_NAMESPACE_IMPL_START
+
 using namespace std;
 
 namespace UFAR {
@@ -61,3 +63,5 @@ void WNetlist::Reset(Wlc_Ntk_t *pNtk) {
 }
 
 }
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/untk/Netlist.h b/src/opt/untk/Netlist.h
@@ -7,8 +7,12 @@
 
 #include <type_traits>
 
+#include "misc/util/abc_namespaces.h"
+
 typedef struct Wlc_Ntk_t_ Wlc_Ntk_t;
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 namespace UFAR {
 
 class WNetlist {
@@ -30,4 +34,6 @@ class WNetlist {
 
 }
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif //ABC_WAR_NETLIST_H
diff --git a/src/opt/untk/NtkCmd.cpp b/src/opt/untk/NtkCmd.cpp
@@ -7,6 +7,10 @@
 
 #include "opt/untk/NtkCmd.h"
 
+ABC_NAMESPACE_IMPL_START
+
 void Ntk_Init (Abc_Frame_t *pAbc)
 {
 }
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/untk/NtkCmd.h b/src/opt/untk/NtkCmd.h
@@ -10,6 +10,10 @@
 
 #include "base/main/mainInt.h"
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 void Ntk_Init(Abc_Frame_t *pAbc);
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif /* SRC_EXT2_NTK_NTKCMD_H_ */
diff --git a/src/opt/untk/NtkNtk.cpp b/src/opt/untk/NtkNtk.cpp
@@ -20,6 +20,8 @@
 #include <sys/wait.h>
 #include <fstream>
 
+ABC_NAMESPACE_IMPL_START
+
 extern "C" {
     Abc_Ntk_t * Abc_NtkFromAigPhase( Aig_Man_t * pMan );
     int Abc_NtkDarPdr( Abc_Ntk_t * pNtk, Pdr_Par_t * pPars );
@@ -1485,3 +1487,5 @@ void TestInvariant(string& nameNtk, string& nameInv) {
 
 
 }
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/untk/NtkNtk.h b/src/opt/untk/NtkNtk.h
@@ -17,6 +17,8 @@
 #include <base/wlc/wlc.h>
 #include "Netlist.h"
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 typedef struct Wlc_Ntk_t_ Wlc_Ntk_t;
 typedef struct Abc_Cex_t_ Abc_Cex_t;
 typedef struct Vec_Int_t_ Vec_Int_t;
@@ -147,4 +149,6 @@ Wlc_Ntk_t * MakeUnderApprox2(Wlc_Ntk_t * pNtk, const std::set<unsigned>& types,
 
 }
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif /* SRC_EXT2_NTK_NTKNTK_H_ */
diff --git a/src/opt/util/util.cpp b/src/opt/util/util.cpp
@@ -9,8 +9,11 @@
 #include <csignal>
 #include <unistd.h>
 
+#include "misc/util/abc_namespaces.h"
 #include "util.h"
 
+ABC_NAMESPACE_IMPL_START
+
 using namespace std;
 
 unsigned LogT::loglevel = 0;
@@ -117,3 +120,5 @@ void kill_on_parent_death(int sig)
 }
 
 #endif
+
+ABC_NAMESPACE_IMPL_END
diff --git a/src/opt/util/util.h b/src/opt/util/util.h
@@ -18,6 +18,8 @@
 
 #include <sys/time.h>
 
+ABC_NAMESPACE_CXX_HEADER_START
+
 class LogT {
     public:
         LogT(unsigned _loglevel = 0) {
@@ -82,4 +84,6 @@ void kill_on_parent_death(int sig);
 
 int call_python(const char* modulename, const char* funcname, const char* aig, std::vector<int>& cex);
 
+ABC_NAMESPACE_CXX_HEADER_END
+
 #endif /* SRC_EXT2_UTIL_UTIL_H_ */

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`#include <sat/cnf/cnf.h>`
`17`	`17`	`#include <aig/gia/giaAig.h>`
`18`	`18`
	`19`	`+ABC_NAMESPACE_IMPL_START`
	`20`	`+`
`19`	`21`	`extern "C" {`
`20`	`22`	`Abc_Ntk_t * Abc_NtkFromAigPhase( Aig_Man_t * pMan );`
`21`	`23`	`void Wlc_NtkSimulatePrint( Wlc_Ntk_t * p, Vec_Int_t * vNodes, Vec_Ptr_t * vRes, int nWords, int nFrames );`
`@@ -1661,3 +1663,5 @@ void UfarManager::_read_states(const std::string &file) {`
`1661`	`1663`	`}`
`1662`	`1664`
`1663`	`1665`	`}`
	`1666`	`+`
	`1667`	`+ABC_NAMESPACE_IMPL_END`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,13 @@`
`9`	`9`	`#include <vector>`
`10`	`10`	`#include <string>`
`11`	`11`
	`12`	`+ABC_NAMESPACE_CXX_HEADER_START`
	`13`	`+`
`12`	`14`	`namespace UFAR`
`13`	`15`	`{`
`14`	`16`	`int RunConcurrentSolver( Wlc_Ntk_t * pNtk, const std::vector<std::string>& vSolvers, Abc_Cex_t ** ppCex, struct timespec * timeout );`
`15`	`17`	`}`
`16`	`18`
	`19`	`+ABC_NAMESPACE_CXX_HEADER_END`
	`20`	`+`
`17`	`21`	`#endif //SRC_EXT2_UFAR_PTH_H`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`#include <iostream>`
`10`	`10`
	`11`	`+ABC_NAMESPACE_IMPL_START`
	`12`	`+`
`11`	`13`	`using namespace std;`
`12`	`14`
`13`	`15`	`namespace UFAR {`
`@@ -61,3 +63,5 @@ void WNetlist::Reset(Wlc_Ntk_t *pNtk) {`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`}`
	`66`	`+`
	`67`	`+ABC_NAMESPACE_IMPL_END`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,10 @@`
`7`	`7`
`8`	`8`	`#include "opt/untk/NtkCmd.h"`
`9`	`9`
	`10`	`+ABC_NAMESPACE_IMPL_START`
	`11`	`+`
`10`	`12`	`void Ntk_Init (Abc_Frame_t *pAbc)`
`11`	`13`	`{`
`12`	`14`	`}`
	`15`	`+`
	`16`	`+ABC_NAMESPACE_IMPL_END`