Merge pull request #315 from redboltz/fix_boost_pp_variadics

redboltz · redboltz · commit 1b13523c7f37 · 2015-07-15T16:38:01.000+09:00
Added BOOST_PP_VARIADICS checking to avoid multiple definition.
diff --git a/erb/cpp03_define_map.hpp.erb b/erb/cpp03_define_map.hpp.erb
@@ -24,7 +24,10 @@
 // http://www.boost.org/libs/preprocessor/doc/ref/variadics.html
 // However, supporting compiler detection is not complete. msgpack-c requires
 // variadic macro arguments support. So BOOST_PP_VARIADICS is defined here explicitly.
+#if !defined(BOOST_PP_VARIADICS)
 #define BOOST_PP_VARIADICS
+#endif
+
 #include <boost/preprocessor.hpp>
 
 #include "msgpack/versioning.hpp"
diff --git a/include/msgpack/adaptor/detail/cpp03_define_map.hpp b/include/msgpack/adaptor/detail/cpp03_define_map.hpp
@@ -24,7 +24,10 @@
 // http://www.boost.org/libs/preprocessor/doc/ref/variadics.html
 // However, supporting compiler detection is not complete. msgpack-c requires
 // variadic macro arguments support. So BOOST_PP_VARIADICS is defined here explicitly.
+#if !defined(BOOST_PP_VARIADICS)
 #define BOOST_PP_VARIADICS
+#endif
+
 #include <boost/preprocessor.hpp>
 
 #include "msgpack/versioning.hpp"
diff --git a/include/msgpack/adaptor/detail/cpp11_define_map.hpp b/include/msgpack/adaptor/detail/cpp11_define_map.hpp
@@ -24,7 +24,10 @@
 // http://www.boost.org/libs/preprocessor/doc/ref/variadics.html
 // However, supporting compiler detection is not complete. msgpack-c requires
 // variadic macro arguments support. So BOOST_PP_VARIADICS is defined here explicitly.
+#if !defined(BOOST_PP_VARIADICS)
 #define BOOST_PP_VARIADICS
+#endif
+
 #include <boost/preprocessor.hpp>
 
 #include "msgpack/versioning.hpp"
