Add support for modular build structure. (#274)

* Make the library modular usable.

* Switch to library requirements instead of source. As source puts extra source in install targets.

* Add missing import-search for cconfig/predef checks.

* Add requires-b2 check to top-level build file.

* Bump B2 require to 5.2

* Change all <source> references to <library>.

* Update copyright dates.

* Move inter-lib dependencies to a project variable and into the build targets.

* Update build deps.

.github/workflows/ci.yml

@@ -344,6 +344,8 @@ jobs:
           git submodule init libs/type_traits
           git submodule init libs/typeof
           git submodule init libs/utility
+          git submodule init libs/describe
+          git submodule init libs/mp11
           git submodule init libs/headers tools/boost_install tools/build
           git submodule update
           rm -rf libs/fusion
@@ -452,6 +454,8 @@ jobs:
           git submodule init libs/type_traits
           git submodule init libs/typeof
           git submodule init libs/utility
+          git submodule init libs/describe
+          git submodule init libs/mp11
           git submodule init libs/headers tools/boost_install tools/build
           git submodule update
           rm -rf libs/fusion
@@ -464,4 +468,4 @@ jobs:
 
           ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD
 
-          fi
+          fi

CMakeLists.txt

@@ -24,4 +24,6 @@ target_link_libraries(boost_fusion
         Boost::typeof
         Boost::utility
         Boost::functional
+        Boost::describe
+        Boost::mp11
 )

appveyor.yml

@@ -82,6 +82,8 @@ install:
   - git submodule init libs/type_traits
   - git submodule init libs/typeof
   - git submodule init libs/utility
+  - git submodule init libs/describe
+  - git submodule init libs/mp11
 
   - git submodule init libs/headers tools/boost_install tools/build
   - git submodule update

build.jam

@@ -0,0 +1,34 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/config//boost_config
+    /boost/container_hash//boost_container_hash
+    /boost/core//boost_core
+    /boost/function_types//boost_function_types
+    /boost/functional//boost_functional
+    /boost/mpl//boost_mpl
+    /boost/preprocessor//boost_preprocessor
+    /boost/static_assert//boost_static_assert
+    /boost/tuple//boost_tuple
+    /boost/type_traits//boost_type_traits
+    /boost/typeof//boost_typeof
+    /boost/utility//boost_utility ;
+
+project /boost/fusion
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_fusion : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_fusion test ]
+    ;
+
+call-if : boost-library fusion
+    ;
+

example/extension/detail/advance_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ADVANCE_IMPL_20060222_2150)
+#ifndef BOOST_FUSION_ADVANCE_IMPL_20060222_2150
 #define BOOST_FUSION_ADVANCE_IMPL_20060222_2150
 
 namespace example

example/extension/detail/at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_20060223_2017)
+#ifndef BOOST_FUSION_AT_IMPL_20060223_2017
 #define BOOST_FUSION_AT_IMPL_20060223_2017
 
 #include <string>

example/extension/detail/at_key_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_KEY_IMPL_20060223_2017)
+#ifndef BOOST_FUSION_AT_KEY_IMPL_20060223_2017
 #define BOOST_FUSION_AT_KEY_IMPL_20060223_2017
 
 #include <string>

example/extension/detail/begin_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_20060222_2042)
+#ifndef BOOST_FUSION_BEGIN_IMPL_20060222_2042
 #define BOOST_FUSION_BEGIN_IMPL_20060222_2042
 
 #include "../example_struct_iterator.hpp"

example/extension/detail/category_of_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037
 #define BOOST_FUSION_CATEGORY_OF_IMPL_20060223_2037
 
 #include <boost/fusion/support/category_of.hpp>

example/extension/detail/deref_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DEREF_IMPL_20060222_1952)
+#ifndef BOOST_FUSION_DEREF_IMPL_20060222_1952
 #define BOOST_FUSION_DEREF_IMPL_20060222_1952
 
 #include <boost/static_assert.hpp>

example/extension/detail/distance_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_DISTANCE_IMPL_20060223_0814)
+#ifndef BOOST_FUSION_DISTANCE_IMPL_20060223_0814
 #define BOOST_FUSION_DISTANCE_IMPL_20060223_0814
 
 #include <boost/mpl/minus.hpp>

example/extension/detail/end_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_20060222_2042)
+#ifndef BOOST_FUSION_END_IMPL_20060222_2042
 #define BOOST_FUSION_END_IMPL_20060222_2042
 
 #include "../example_struct_iterator.hpp"

example/extension/detail/equal_to_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941)
+#ifndef BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941
 #define BOOST_FUSION_EQUAL_TO_IMPL_20060223_1941
 
 #include <boost/mpl/equal_to.hpp>

example/extension/detail/has_key_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_HAS_KEY_IMPL_20060223_2156)
+#ifndef BOOST_FUSION_HAS_KEY_IMPL_20060223_2156
 #define BOOST_FUSION_HAS_KEY_IMPL_20060223_2156
 
 #include <boost/type_traits/is_same.hpp>

example/extension/detail/is_sequence_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_20060228_1946
 
 #include <boost/mpl/bool.hpp>

example/extension/detail/is_view_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_200604227_2150)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_200604227_2150
 #define BOOST_FUSION_IS_VIEW_IMPL_200604227_2150
 
 #include <boost/mpl/bool.hpp>

example/extension/detail/next_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_NEXT_IMPL_20060222_1859)
+#ifndef BOOST_FUSION_NEXT_IMPL_20060222_1859
 #define BOOST_FUSION_NEXT_IMPL_20060222_1859
 
 namespace example

example/extension/detail/prior_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_PRIOR_IMPL_20060222_1944)
+#ifndef BOOST_FUSION_PRIOR_IMPL_20060222_1944
 #define BOOST_FUSION_PRIOR_IMPL_20060222_1944
 
 namespace example

example/extension/detail/size_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_20060223_2033)
+#ifndef BOOST_FUSION_SIZE_IMPL_20060223_2033
 #define BOOST_FUSION_SIZE_IMPL_20060223_2033
 
 #include <boost/mpl/int.hpp>

example/extension/detail/value_at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_20060223_2025)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_20060223_2025
 #define BOOST_FUSION_VALUE_AT_IMPL_20060223_2025
 
 namespace example

example/extension/detail/value_at_key_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025)
+#ifndef BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025
 #define BOOST_FUSION_VALUE_AT_KEY_IMPL_20060223_2025
 
 namespace fields

example/extension/detail/value_of_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_OF_IMPL_20060223_1905)
+#ifndef BOOST_FUSION_VALUE_OF_IMPL_20060223_1905
 #define BOOST_FUSION_VALUE_OF_IMPL_20060223_1905
 
 #include <string>

example/extension/example_struct.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT
 #define BOOST_FUSION_EXAMPLE_STRUCT
 
 #include "./tag_of.hpp"

example/extension/example_struct_iterator.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
 #define BOOST_FUSION_EXAMPLE_STRUCT_ITERATOR
 
 #include <boost/fusion/support/iterator_base.hpp>

example/extension/example_struct_type.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EXAMPLE_STRUCT_TYPE)
+#ifndef BOOST_FUSION_EXAMPLE_STRUCT_TYPE
 #define BOOST_FUSION_EXAMPLE_STRUCT_TYPE
 
 #include <string>

example/extension/tag_of.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_20060222_2052)
+#ifndef BOOST_FUSION_TAG_OF_20060222_2052
 #define BOOST_FUSION_TAG_OF_20060222_2052
 
 #include <boost/fusion/support/tag_of_fwd.hpp>

include/boost/fusion/adapted.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
+#ifndef BOOST_FUSION_ADAPTED_30122005_1420
 #define BOOST_FUSION_ADAPTED_30122005_1420
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/array.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ARRAY_27122005_1035)
+#ifndef BOOST_FUSION_ARRAY_27122005_1035
 #define BOOST_FUSION_ARRAY_27122005_1035
 
 //For backwards compatibility

include/boost/fusion/adapted/boost_array.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_ARRAY_27122005_1035)
+#ifndef BOOST_FUSION_BOOST_ARRAY_27122005_1035
 #define BOOST_FUSION_BOOST_ARRAY_27122005_1035
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/array_iterator.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ARRAY_ITERATOR_26122005_2250)
+#ifndef BOOST_FUSION_ARRAY_ITERATOR_26122005_2250
 #define BOOST_FUSION_ARRAY_ITERATOR_26122005_2250
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_27122005_1241)
+#ifndef BOOST_FUSION_AT_IMPL_27122005_1241
 #define BOOST_FUSION_AT_IMPL_27122005_1241
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
+#ifndef BOOST_FUSION_BEGIN_IMPL_27122005_1117
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
 #define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/end_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
+#ifndef BOOST_FUSION_END_IMPL_27122005_1120
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_27122005_1648
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_27042006_2221)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_27042006_2221
 #define BOOST_FUSION_IS_VIEW_IMPL_27042006_2221
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_array/detail/size_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_27122005_1251)
+#ifndef BOOST_FUSION_SIZE_IMPL_27122005_1251
 #define BOOST_FUSION_SIZE_IMPL_27122005_1251
 
 namespace boost { namespace fusion {

include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_27122005_1256)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_27122005_1256
 #define BOOST_FUSION_VALUE_AT_IMPL_27122005_1256
 
 namespace boost { namespace fusion {

include/boost/fusion/adapted/boost_array/tag_of.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(FUSION_SEQUENCE_TAG_OF_27122005_1030)
+#ifndef FUSION_SEQUENCE_TAG_OF_27122005_1030
 #define FUSION_SEQUENCE_TAG_OF_27122005_1030
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_TUPLE_09272006_0732)
+#ifndef BOOST_FUSION_BOOST_TUPLE_09272006_0732
 #define BOOST_FUSION_BOOST_TUPLE_09272006_0732
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_BOOST_TUPLE_ITERATOR_09262006_1851)
+#ifndef FUSION_BOOST_TUPLE_ITERATOR_09262006_1851
 #define FUSION_BOOST_TUPLE_ITERATOR_09262006_1851
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_09262006_1920)
+#ifndef BOOST_FUSION_AT_IMPL_09262006_1920
 #define BOOST_FUSION_AT_IMPL_09262006_1920
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_09272006_0719)
+#ifndef BOOST_FUSION_BEGIN_IMPL_09272006_0719
 #define BOOST_FUSION_BEGIN_IMPL_09272006_0719
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/build_cons.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_CONS_10172012_0130)
+#ifndef BOOST_FUSION_BUILD_CONS_10172012_0130
 #define BOOST_FUSION_BUILD_CONS_10172012_0130
 
 #include <boost/tuple/tuple.hpp>

include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726
 #define BOOST_FUSION_CATEGORY_OF_IMPL_09272006_0726
 
 namespace boost { namespace fusion 

include/boost/fusion/adapted/boost_tuple/detail/convert_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CONVERT_IMPL_10172012_0120)
+#ifndef BOOST_FUSION_CONVERT_IMPL_10172012_0120
 #define BOOST_FUSION_CONVERT_IMPL_10172012_0120
 
 #include <boost/tuple/tuple.hpp>

include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_09272006_0721)
+#ifndef BOOST_FUSION_END_IMPL_09272006_0721
 #define BOOST_FUSION_END_IMPL_09272006_0721
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_09272006_0726
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_09272006_0725)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_09272006_0725
 #define BOOST_FUSION_IS_VIEW_IMPL_09272006_0725
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_09272006_0724)
+#ifndef BOOST_FUSION_SIZE_IMPL_09272006_0724
 #define BOOST_FUSION_SIZE_IMPL_09272006_0724
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_09262006_1926)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_09262006_1926
 #define BOOST_FUSION_VALUE_AT_IMPL_09262006_1926
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/boost_tuple/mpl/clear.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CLEAR_10172012_0100)
+#ifndef BOOST_FUSION_CLEAR_10172012_0100
 #define BOOST_FUSION_CLEAR_10172012_0100
 
 #include <boost/mpl/identity.hpp>

include/boost/fusion/adapted/boost_tuple/tag_of.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_09262006_1900)
+#ifndef BOOST_FUSION_TAG_OF_09262006_1900
 #define BOOST_FUSION_TAG_OF_09262006_1900
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_MPL_31122005_1152)
+#ifndef BOOST_FUSION_MPL_31122005_1152
 #define BOOST_FUSION_MPL_31122005_1152
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_31122005_1642)
+#ifndef BOOST_FUSION_AT_IMPL_31122005_1642
 #define BOOST_FUSION_AT_IMPL_31122005_1642
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/begin_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_31122005_1209)
+#ifndef BOOST_FUSION_BEGIN_IMPL_31122005_1209
 #define BOOST_FUSION_BEGIN_IMPL_31122005_1209
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141
 #define BOOST_FUSION_CATEGORY_OF_IMPL_20060217_2141
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/empty_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_EMPTY_IMPL_31122005_1554)
+#ifndef BOOST_FUSION_EMPTY_IMPL_31122005_1554
 #define BOOST_FUSION_EMPTY_IMPL_31122005_1554
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/end_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_31122005_1237)
+#ifndef BOOST_FUSION_END_IMPL_31122005_1237
 #define BOOST_FUSION_END_IMPL_31122005_1237
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_HAS_KEY_IMPL_31122005_1647)
+#ifndef BOOST_FUSION_HAS_KEY_IMPL_31122005_1647
 #define BOOST_FUSION_HAS_KEY_IMPL_31122005_1647
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_31122005_1505
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_03202006_0048)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_03202006_0048
 #define BOOST_FUSION_IS_VIEW_IMPL_03202006_0048
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/size_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_31122005_1508)
+#ifndef BOOST_FUSION_SIZE_IMPL_31122005_1508
 #define BOOST_FUSION_SIZE_IMPL_31122005_1508
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_31122005_1621)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_31122005_1621
 #define BOOST_FUSION_VALUE_AT_IMPL_31122005_1621
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/mpl/mpl_iterator.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_MPL_ITERATOR_05052005_0731)
+#ifndef FUSION_MPL_ITERATOR_05052005_0731
 #define FUSION_MPL_ITERATOR_05052005_0731
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_array.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY__01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY__01062013_1700
 #define BOOST_FUSION_STD_ARRAY__01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>

include/boost/fusion/adapted/std_array/detail/array_size.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_ARRAY_SIZE_01062013_1700
 
 #include <cstddef>

include/boost/fusion/adapted/std_array/detail/at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_AT_IMPL_01062013_1700
 
 #include <boost/type_traits/is_const.hpp>

include/boost/fusion/adapted/std_array/detail/begin_impl.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_BEGIN_OF_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>

include/boost/fusion/adapted/std_array/detail/category_of_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_CATEGORY_OF_IMPL_01062013_1700
 
 #include <boost/config/no_tr1/utility.hpp>

include/boost/fusion/adapted/std_array/detail/end_impl.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_END_OF_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/std_array_iterator.hpp>

include/boost/fusion/adapted/std_array/detail/is_sequence_impl.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_IS_SEQUENCE_IMPL_01062013_1700
 
 #include <boost/mpl/bool.hpp>

include/boost/fusion/adapted/std_array/detail/is_view_impl.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_IS_VIEW_IMPL_01062013_1700
 
 #include <boost/mpl/bool.hpp>

include/boost/fusion/adapted/std_array/detail/size_impl.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_SIZE_IMPL_01062013_1700
 
 #include <boost/fusion/adapted/std_array/detail/array_size.hpp>

include/boost/fusion/adapted/std_array/detail/value_at_impl.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_VALUE_AT_IMPL_01062013_1700
 
 namespace boost { namespace fusion {

include/boost/fusion/adapted/std_array/std_array_iterator.hpp

@@ -6,7 +6,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_ARRAY_ITERATOR_01062013_1700
 
 #include <cstddef>

include/boost/fusion/adapted/std_array/tag_of.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700)
+#ifndef BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700
 #define BOOST_FUSION_STD_ARRAY_TAG_OF_01062013_1700
 
 #include <boost/fusion/support/tag_of_fwd.hpp>

include/boost/fusion/adapted/std_tuple.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BOOST_TUPLE_09242011_1744)
+#ifndef BOOST_FUSION_BOOST_TUPLE_09242011_1744
 #define BOOST_FUSION_BOOST_TUPLE_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/at_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_AT_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_AT_IMPL_09242011_1744
 #define BOOST_FUSION_AT_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/begin_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BEGIN_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_BEGIN_IMPL_09242011_1744
 #define BOOST_FUSION_BEGIN_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/build_std_tuple.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100)
+#ifndef BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100
 #define BOOST_FUSION_BUILD_STD_TUPLE_05292014_0100
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/category_of_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940)
+#ifndef BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940
 #define BOOST_FUSION_CATEGORY_OF_IMPL_04202013_0940
 
 namespace boost { namespace fusion

include/boost/fusion/adapted/std_tuple/detail/convert_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CONVERT_IMPL_10172012_0940)
+#ifndef BOOST_FUSION_CONVERT_IMPL_10172012_0940
 #define BOOST_FUSION_CONVERT_IMPL_10172012_0940
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/end_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_END_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_END_IMPL_09242011_1744
 #define BOOST_FUSION_END_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/is_sequence_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744
 #define BOOST_FUSION_IS_SEQUENCE_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/is_view_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_IS_VIEW_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_IS_VIEW_IMPL_09242011_1744
 #define BOOST_FUSION_IS_VIEW_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/size_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_SIZE_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_SIZE_IMPL_09242011_1744
 #define BOOST_FUSION_SIZE_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/detail/value_at_impl.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_VALUE_AT_IMPL_09242011_1744)
+#ifndef BOOST_FUSION_VALUE_AT_IMPL_09242011_1744
 #define BOOST_FUSION_VALUE_AT_IMPL_09242011_1744
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/mpl/clear.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_CLEAR_10172012_0940)
+#ifndef BOOST_FUSION_CLEAR_10172012_0940
 #define BOOST_FUSION_CLEAR_10172012_0940
 
 #include <boost/mpl/identity.hpp>

include/boost/fusion/adapted/std_tuple/std_tuple_iterator.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_STD_TUPLE_ITERATOR_09112011_1905)
+#ifndef FUSION_STD_TUPLE_ITERATOR_09112011_1905
 #define FUSION_STD_TUPLE_ITERATOR_09112011_1905
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/std_tuple/tag_of.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_TAG_OF_09112011_1842)
+#ifndef BOOST_FUSION_TAG_OF_09112011_1842
 #define BOOST_FUSION_TAG_OF_09112011_1842
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/adapted/struct/detail/adapt_base.hpp

@@ -143,7 +143,7 @@
         I,                                                                      \
         ATTRIBUTE)
 
-#ifdef BOOST_MSVC
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1935)
 #   define BOOST_FUSION_ADAPT_STRUCT_MSVC_REDEFINE_TEMPLATE_PARAM(R,_,ELEM)     \
         typedef ELEM ELEM;
 #   define BOOST_FUSION_ADAPT_STRUCT_MSVC_REDEFINE_TEMPLATE_PARAMS_IMPL(SEQ)    \

include/boost/fusion/algorithm.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_10022005_0549)
+#ifndef FUSION_ALGORITHM_10022005_0549
 #define FUSION_ALGORITHM_10022005_0549
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/auxiliary.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_AUXILIARY_02192011_0907)
+#ifndef FUSION_ALGORITHM_AUXILIARY_02192011_0907
 #define FUSION_ALGORITHM_AUXILIARY_02192011_0907
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/auxiliary/copy.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_COPY_02162011_2308)
+#ifndef FUSION_COPY_02162011_2308
 #define FUSION_COPY_02162011_2308
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/auxiliary/move.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_MOVE_01192013_2225)
+#ifndef FUSION_MOVE_01192013_2225
 #define FUSION_MOVE_01192013_2225
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/iteration.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_ALGORITHM_ITERATION_10022005_0549)
+#ifndef FUSION_ALGORITHM_ITERATION_10022005_0549
 #define FUSION_ALGORITHM_ITERATION_10022005_0549
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/iteration/accumulate.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(FUSION_ACCUMULATE_09172005_1032)
+#ifndef FUSION_ACCUMULATE_09172005_1032
 #define FUSION_ACCUMULATE_09172005_1032
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/iteration/accumulate_fwd.hpp

@@ -5,7 +5,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)
 ==============================================================================*/
-#if !defined(BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED)
+#ifndef BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED
 #define BOOST_FUSION_ACCUMULATE_FWD_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>

include/boost/fusion/algorithm/iteration/detail/for_each.hpp

@@ -4,7 +4,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)
 ==============================================================================*/
-#if !defined(FUSION_FOR_EACH_05052005_1028)
+#ifndef FUSION_FOR_EACH_05052005_1028
 #define FUSION_FOR_EACH_05052005_1028
 
 #include <boost/fusion/support/config.hpp>