Add parser ifdefs directly in poplite lib

lwinkler · Aug 23, 2018 · 0302da5 · 0302da5
1 parent 6e3b320
commit 0302da5
Show file tree

Hide file tree

Showing 37 changed files with 49 additions and 38 deletions.
diff --git a/alloc/alloc.hpp b/alloc/alloc.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_ALLOC_H
 #define POP_ALLOC_H
 
@@ -27,3 +28,4 @@ class allocator {
 }
 
 #endif
+#endif
diff --git a/alloc/local.hpp b/alloc/local.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_ALLOC_LOCAL_H
 #define POP_ALLOC_LOCAL_H
 
@@ -63,3 +64,4 @@ class local_allocator : public allocator {
 }
 
 #endif
+#endif
diff --git a/alloc/manual.hpp b/alloc/manual.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_ALLOC_MANUAL_H
 #define POP_ALLOC_MANUAL_H
 
@@ -31,3 +32,4 @@ class manual_allocator : public allocator {
 }
 
 #endif
+#endif
diff --git a/alloc/ssh.hpp b/alloc/ssh.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_ALLOC_SSH_H
 #define POP_ALLOC_SSH_H
 
@@ -54,3 +55,4 @@ class ssh_allocator : public allocator {
 }
 
 #endif
+#endif
diff --git a/class/apply_tuple.hpp b/class/apply_tuple.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_APPLY_TUPLE_H
 #define POPLITE_APPLY_TUPLE_H
 
@@ -142,3 +143,4 @@ R apply_tuple( R (*f)(ArgsF...),
 }
 } // namespace
 #endif
+#endif
diff --git a/class/apply_tuple_const.hpp b/class/apply_tuple_const.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_APPLY_TUPLE_CONST_H
 #define POPLITE_APPLY_TUPLE_CONST_H
 
@@ -142,3 +143,4 @@ R apply_tuple_const( R (*f)(ArgsF...),
 }
 } // namespace
 #endif
+#endif
diff --git a/class/apply_tuple_constr.hpp b/class/apply_tuple_constr.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_APPLY_TUPLE_CONSTR_H
 #define POPLITE_APPLY_TUPLE_CONSTR_H
 
@@ -68,3 +69,4 @@ template < typename T, typename... ArgsF, typename... ArgsT > T* apply_tuple_con
 }
 } // namespace
 #endif
+#endif
diff --git a/class/apply_tuple_static.hpp b/class/apply_tuple_static.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_APPLY_TUPLE_STATIC_H
 #define POPLITE_APPLY_TUPLE_STATIC_H
 
@@ -142,3 +143,4 @@ R apply_tuple_static( R (*f)(ArgsF...),
 }
 } // namespace
 #endif
+#endif
diff --git a/class/broker.hpp b/class/broker.hpp
@@ -7,6 +7,7 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#ifndef _POP_PARSER_
 #ifndef POPLITE_BROKER_H
 #define POPLITE_BROKER_H
 
@@ -160,3 +161,4 @@ template<class ParClass> class broker : private boost::noncopyable {
 } // namespaces
 
 #endif
+#endif
diff --git a/class/interface.hpp b/class/interface.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_INTERFACE_H
 #define POPLITE_INTERFACE_H
 
@@ -205,5 +206,5 @@ class interface {
 	}
 };
 }
-
+#endif
 #endif
diff --git a/class/system.hpp b/class/system.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_SYSTEM_H
 #define POPLITE_SYSTEM_H
 
@@ -204,5 +205,5 @@ class system {
 };
 }
 
-
+#endif
 #endif
diff --git a/com/accesspoint.hpp b/com/accesspoint.hpp
@@ -7,6 +7,7 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#ifndef _POP_PARSER_
 #ifndef POP_ACCESSPOINT_HPP
 #define POP_ACCESSPOINT_HPP
 
@@ -58,3 +59,4 @@ class accesspoint {
 } // namespace
 
 #endif
+#endif
diff --git a/com/broker_combox.hpp b/com/broker_combox.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_BROKER_COMBOX_H
 #define POP_BROKER_COMBOX_H
 
@@ -231,3 +232,4 @@ template<class ParClass>class broker_combox {
 } // namespace
 
 #endif
+#endif
diff --git a/com/connection.hpp b/com/connection.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_CONNECTION_HPP
 #define POP_CONNECTION_HPP
 
@@ -262,3 +263,4 @@ using connection_ptr = boost::shared_ptr<connection>;
 } // namespace
 
 #endif
+#endif
diff --git a/com/exception.hpp b/com/exception.hpp
@@ -7,6 +7,7 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
+#ifndef _POP_PARSER_
 #ifndef POP_EXCEPTION_HPP
 #define POP_EXCEPTION_HPP
 
@@ -39,3 +40,4 @@ class exception : public std::exception {
 } // namespace
 
 #endif
+#endif
diff --git a/com/interface_combox.hpp b/com/interface_combox.hpp
@@ -10,6 +10,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POP_INTERFACE_COMBOX_H
 #define POP_INTERFACE_COMBOX_H
 
@@ -110,3 +111,4 @@ class interface_combox {
 } // namespace
 
 #endif
+#endif
diff --git a/com/serialize.hpp b/com/serialize.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_SERIALIZE_H
 #define POPLITE_SERIALIZE_H
 
@@ -63,3 +64,4 @@ void serialize_out(Archive & ar, std::tuple<Args...> & t1) {
 }
 
 #endif
+#endif
diff --git a/com/serialize_tuple.hpp b/com/serialize_tuple.hpp
@@ -21,6 +21,7 @@
    or implied, of Christopher Allen Ogden.
  */
 
+#ifndef _POP_PARSER_
 #ifndef _SERIALIZE_TUPLE_
 #define _SERIALIZE_TUPLE_
 #include <tuple>
@@ -52,3 +53,4 @@ void serialize(Archive & ar, std::tuple<Args...> & t, const unsigned int version
 }
 }
 #endif
+#endif
diff --git a/com/serialize_unique_ptr.hpp b/com/serialize_unique_ptr.hpp
@@ -8,6 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
+#ifndef _POP_PARSER_
 #ifndef POPLITE_SERIALIZE_UNIQUE_PTR_H
 #define POPLITE_SERIALIZEUNIQUE_PTR__H
 
@@ -49,3 +50,4 @@ inline void serialize(
 } // namespace boost
 
 #endif
+#endif
diff --git a/examples/chat/chat_client.hpp b/examples/chat/chat_client.hpp
@@ -15,11 +15,9 @@
 #include <map>
 #include <string>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 #include "com/accesspoint.hpp"

diff --git a/examples/get_and_set/test_class.hpp b/examples/get_and_set/test_class.hpp
@@ -15,11 +15,9 @@
 #include <string>
 #include <boost/core/noncopyable.hpp>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/inheritance/child.hpp b/examples/inheritance/child.hpp
@@ -14,11 +14,9 @@
 #include <iostream>
 #include <string>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/ping_pong/mutex.hpp b/examples/ping_pong/mutex.hpp
@@ -14,11 +14,9 @@
 #include <iostream>
 #include <boost/signals2/mutex.hpp>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/ping_pong/ping_pong.hpp b/examples/ping_pong/ping_pong.hpp
@@ -14,12 +14,10 @@
 #include <iostream>
 #include <memory>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "alloc/ssh.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 #include "com/accesspoint.hpp"

diff --git a/examples/templates/map_storage.hpp b/examples/templates/map_storage.hpp
@@ -13,11 +13,9 @@
 
 #include <map>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/templates/printer.hpp b/examples/templates/printer.hpp
@@ -13,11 +13,9 @@
 
 #include <iostream>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/templates/storage.hpp b/examples/templates/storage.hpp
@@ -13,11 +13,9 @@
 
 #include <vector>
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 

diff --git a/examples/word_list_game/server.hpp b/examples/word_list_game/server.hpp
@@ -16,12 +16,9 @@
 #include <map>
 #include <set>
 
-
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"
 #include "com/accesspoint.hpp"

diff --git a/parser/defs.hpp b/parser/defs.hpp
@@ -21,6 +21,17 @@ __attribute__((annotate("pop_template_method:"#types)))\
 static int template_types_of_##name;
 */
 
+// Forward declarations
+namespace pop {
+	class allocator;
+	class interface;
+	class system;
+	class accesspoint;
+	class connection;
+	class exception;
+	class interface_combox;
+}
+
 #else
 // Do not use in normal time
 #define POP_CLASS class
@@ -30,6 +41,5 @@ static int template_types_of_##name;
 #define POP_ALLOCATION(x)
 #define POP_TEMPLATE_TYPES(...)
 // #define POP_TEMPLATE_METHOD(x,y,z)
-
 #endif
 #endif
diff --git a/popc_tests/asynccreation/POPObject.hpp b/popc_tests/asynccreation/POPObject.hpp
@@ -6,11 +6,9 @@
  * @date 2012.07.11
  */
 
-#ifndef _POP_PARSER_ // this accelerates parsing
 #include "class/system.hpp"
 #include "alloc/local.hpp"
 #include "class/interface.hpp"
-#endif
 
 #include "parser/defs.hpp"