Better namespaceing of header #defines

nfomon · May 25, 2015 · 82ce5a68379a9649326c10815f5259c8a965577a · 82ce5a6
1 parent 565d298
commit 82ce5a68379a9649326c10815f5259c8a965577a
diff --git a/exstatik/Codegen.h b/exstatik/Codegen.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Codegen_h_
-#define _Codegen_h_
+#ifndef _exstatik_Codegen_h_
+#define _exstatik_Codegen_h_
 
 #include "statik/Rule.h"
 
@@ -19,4 +19,4 @@ std::auto_ptr<statik::Rule> CreateCodegen_Nifty();
 
 }
 
-#endif // _Codegen_h_
+#endif // _exstatik_Codegen_h_
diff --git a/exstatik/Compiler.h b/exstatik/Compiler.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Compiler_h_
-#define _Compiler_h_
+#ifndef _exstatik_Compiler_h_
+#define _exstatik_Compiler_h_
 
 #include "statik/Rule.h"
 
@@ -20,4 +20,4 @@ std::auto_ptr<Compiler> MakeCompiler(const std::string& name);
 
 }
 
-#endif // _Compiler_h_
+#endif // _exstatik_Compiler_h_
diff --git a/exstatik/Lexer.h b/exstatik/Lexer.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Lexer_h_
-#define _Lexer_h_
+#ifndef _exstatik_Lexer_h_
+#define _exstatik_Lexer_h_
 
 #include "statik/Rule.h"
 
@@ -17,4 +17,4 @@ std::auto_ptr<statik::Rule> CreateLexer_Nifty();
 
 }
 
-#endif // _Lexer_h_
+#endif // _exstatik_Lexer_h_
diff --git a/exstatik/Parser.h b/exstatik/Parser.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Parser_h_
-#define _Parser_h_
+#ifndef _exstatik_Parser_h_
+#define _exstatik_Parser_h_
 
 #include "statik/Rule.h"
 
@@ -17,4 +17,4 @@ std::auto_ptr<statik::Rule> CreateParser_Nifty();
 
 }
 
-#endif // _Parser_h_
+#endif // _exstatik_Parser_h_
diff --git a/istatik/ConnectorWindow.h b/istatik/ConnectorWindow.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ConnectorWindow_h_
-#define _ConnectorWindow_h_
+#ifndef _istatik_ConnectorWindow_h_
+#define _istatik_ConnectorWindow_h_
 
 #include "ISError.h"
 #include "WindowResponse.h"
@@ -26,4 +26,4 @@ class ConnectorWindow : private boost::noncopyable {
 
 }
 
-#endif // _ConnectorWindow_h_
+#endif // _istatik_ConnectorWindow_h_
diff --git a/istatik/ISError.h b/istatik/ISError.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ISError_h_
-#define _ISError_h_
+#ifndef _istatik_ISError_h_
+#define _istatik_ISError_h_
 
 #include "ISLog.h"
 
@@ -19,4 +19,4 @@ class ISError : public std::runtime_error {
 
 }
 
-#endif // _ISError_h_
+#endif // _istatik_ISError_h_
diff --git a/istatik/ISLog.h b/istatik/ISLog.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ISLog_h_
-#define _ISLog_h_
+#ifndef _istatik_ISLog_h_
+#define _istatik_ISLog_h_
 
 #include "util/Log.h"
 
@@ -12,4 +12,4 @@ extern Log g_log;
 
 }
 
-#endif // _ISLog_h_
+#endif // _istatik_ISLog_h_
diff --git a/istatik/IStatik.h b/istatik/IStatik.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _IStatik_h_
-#define _IStatik_h_
+#ifndef _istatik_IStatik_h_
+#define _istatik_IStatik_h_
 
 #include "ISError.h"
 #include "WindowResponse.h"
@@ -38,4 +38,4 @@ class IStatik {
 
 }
 
-#endif // _IStatik_h_
+#endif // _istatik_IStatik_h_
diff --git a/istatik/InputWindow.h b/istatik/InputWindow.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _InputWindow_h_
-#define _InputWindow_h_
+#ifndef _istatik_InputWindow_h_
+#define _istatik_InputWindow_h_
 
 #include "ISError.h"
 #include "WindowResponse.h"
@@ -78,4 +78,4 @@ class InputWindow {
 
 }
 
-#endif // _InputWindow_h_
+#endif // _istatik_InputWindow_h_
diff --git a/istatik/WindowAction.h b/istatik/WindowAction.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _WindowAction_h_
-#define _WindowAction_h_
+#ifndef _istatik_WindowAction_h_
+#define _istatik_WindowAction_h_
 
 namespace istatik {
 
@@ -23,4 +23,4 @@ struct WindowAction {
 
 }
 
-#endif // _WindowAction_h_
+#endif // _istatik_WindowAction_h_
diff --git a/istatik/WindowResponse.h b/istatik/WindowResponse.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _WindowResponse_h_
-#define _WindowResponse_h_
+#ifndef _istatik_WindowResponse_h_
+#define _istatik_WindowResponse_h_
 
 #include "WindowAction.h"
 
@@ -21,4 +21,4 @@ struct WindowResponse {
 
 }
 
-#endif // _WindowResponse_h_
+#endif // _istatik_WindowResponse_h_
diff --git a/statik/ComputeFunc.h b/statik/ComputeFunc.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ComputeFunc_h_
-#define _ComputeFunc_h_
+#ifndef _statik_ComputeFunc_h_
+#define _statik_ComputeFunc_h_
 
 #include "ConnectorAction.h"
 
@@ -25,4 +25,4 @@ struct ComputeFunc {
 
 }
 
-#endif // _ComputeFunc_h_
+#endif // _statik_ComputeFunc_h_
diff --git a/statik/Connector.h b/statik/Connector.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Connector_h_
-#define _Connector_h_
+#ifndef _statik_Connector_h_
+#define _statik_Connector_h_
 
 #include "ConnectorAction.h"
 #include "Hotlist.h"
@@ -123,4 +123,4 @@ class Connector {
 
 }
 
-#endif // _Connector_h_
+#endif // _statik_Connector_h_
diff --git a/statik/ConnectorAction.h b/statik/ConnectorAction.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ConnectorAction_h_
-#define _ConnectorAction_h_
+#ifndef _statik_ConnectorAction_h_
+#define _statik_ConnectorAction_h_
 
 #include "IList.h"
 
@@ -48,4 +48,4 @@ struct ConnectorAction {
 
 }
 
-#endif // _ConnectorAction_h_
+#endif // _statik_ConnectorAction_h_
diff --git a/statik/Grapher.h b/statik/Grapher.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Grapher_h_
-#define _Grapher_h_
+#ifndef _statik_Grapher_h_
+#define _statik_Grapher_h_
 
 #include "Connector.h"
 #include "IList.h"
@@ -46,4 +46,4 @@ class Grapher {
 
 }
 
-#endif // _Grapher_h_
+#endif // _statik_Grapher_h_
diff --git a/statik/Hotlist.h b/statik/Hotlist.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Hotlist_h_
-#define _Hotlist_h_
+#ifndef _statik_Hotlist_h_
+#define _statik_Hotlist_h_
 
 /* A set of IList nodes that are "hot", meaning their done-ness has changed.
  * They can be Insert()ed or Delete()d on the next Connector.
@@ -55,4 +55,4 @@ class Hotlist {
 
 }
 
-#endif // _Hotlist_h_
+#endif // _statik_Hotlist_h_
diff --git a/statik/IConnection.h b/statik/IConnection.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _IConnection_h_
-#define _IConnection_h_
+#ifndef _statik_IConnection_h_
+#define _statik_IConnection_h_
 
 #include "IList.h"
 
@@ -28,4 +28,4 @@ class IConnection {
 
 }
 
-#endif // _IConnection_h_
+#endif // _statik_IConnection_h_
diff --git a/statik/IList.h b/statik/IList.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _IList_h_
-#define _IList_h_
+#ifndef _statik_IList_h_
+#define _statik_IList_h_
 
 #include "SError.h"
 
@@ -28,4 +28,4 @@ std::ostream& operator<< (std::ostream& out, const IList& node);
 
 }
 
-#endif // _IList_h_
+#endif // _statik_IList_h_
diff --git a/statik/Keyword.h b/statik/Keyword.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Keyword_h_
-#define _Keyword_h_
+#ifndef _statik_Keyword_h_
+#define _statik_Keyword_h_
 
 /* Keyword rule */
 
@@ -38,4 +38,4 @@ std::auto_ptr<ComputeFunc> MakeComputeFunc_Keyword(const std::string& str);
 
 }
 
-#endif // _Keyword_h_
+#endif // _statik_Keyword_h_
diff --git a/statik/ListenerTable.h b/statik/ListenerTable.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ListenerTable_h_
-#define _ListenerTable_h_
+#ifndef _statik_ListenerTable_h_
+#define _statik_ListenerTable_h_
 
 #include "SError.h"
 
@@ -136,4 +136,4 @@ class ListenerTable {
 
 }
 
-#endif // _ListenerTable_h_
+#endif // _statik_ListenerTable_h_
diff --git a/statik/Meta.h b/statik/Meta.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Meta_h_
-#define _Meta_h_
+#ifndef _statik_Meta_h_
+#define _statik_Meta_h_
 
 /* Meta rule
  *
@@ -42,4 +42,4 @@ std::auto_ptr<ComputeFunc> MakeComputeFunc_Meta(const std::string& searchName);
 
 }
 
-#endif // _Meta_h_
+#endif // _statik_Meta_h_
diff --git a/statik/ObjectPool.h b/statik/ObjectPool.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2015 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _ObjectPool_h_
-#define _ObjectPool_h_
+#ifndef _statik_ObjectPool_h_
+#define _statik_ObjectPool_h_
 
 #include "SError.h"
 
@@ -64,4 +64,4 @@ class ObjectPool {
 
 }
 
-#endif // _ObjectPool_h_
+#endif // _statik_ObjectPool_h_
diff --git a/statik/Or.h b/statik/Or.h
@@ -1,8 +1,8 @@
 // Copyright (C) 2014 Michael Biggs.  See the COPYING file at the top-level
 // directory of this distribution and at http://shok.io/code/copyright.html
 
-#ifndef _Or_h_
-#define _Or_h_
+#ifndef _statik_Or_h_
+#define _statik_Or_h_
 
 #include "ComputeFunc.h"
 #include "ConnectorAction.h"
@@ -29,4 +29,4 @@ std::auto_ptr<ComputeFunc> MakeComputeFunc_Or();
 
 }
 
-#endif // _Or_h_
+#endif // _statik_Or_h_