CXX-733: move INLINE macros to compiler.hpp

Author: Machyne

src/bsoncxx/config/compiler.hpp

@@ -0,0 +1,15 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define BSONCXX_INLINE inline __attribute__((__visibility__("hidden"), __always_inline__))

src/bsoncxx/config/postlude.hpp

@@ -16,6 +16,10 @@
 #undef BSONCXX_B64_ASSERT
 #pragma pop_macro("BSONCXX_B64_ASSERT")
 
+// compiler.hpp
+#undef BSONCXX_INLINE
+#pragma pop_macro("BSONCXX_INLINE")
+
 // src/bsoncxx/config/config.hpp.in
 #undef BSONCXX_INLINE_NAMESPACE_BEGIN
 #pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
@@ -53,7 +57,5 @@
 #pragma pop_macro("BSONCXX_PRIVATE")
 
 // prelude.hpp
-#undef BSONCXX_INLINE
-#pragma pop_macro("BSONCXX_INLINE")
 #undef BSONCXX_UNREACHABLE
 #pragma pop_macro("BSONCXX_UNREACHABLE")

src/bsoncxx/config/prelude.hpp

@@ -16,6 +16,10 @@
 #pragma push_macro("BSONCXX_B64_ASSERT")
 #undef BSONCXX_B64_ASSERT
 
+// compiler.hpp
+#pragma push_macro("BSONCXX_INLINE")
+#undef BSONCXX_INLINE
+
 // src/bsoncxx/config/config.hpp.in
 #pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
 #undef BSONCXX_INLINE_NAMESPACE_BEGIN
@@ -52,15 +56,11 @@
 #pragma push_macro("BSONCXX_PRIVATE")
 #undef BSONCXX_PRIVATE
 
+#include <bsoncxx/config/compiler.hpp>
 #include <bsoncxx/config/config.hpp>
 #include <bsoncxx/config/version.hpp>
 #include <bsoncxx/export.hpp>
 
-// TODO to move this to a compiler.hpp header (CXX-733)
-#pragma push_macro("BSONCXX_INLINE")
-#undef BSONCXX_INLINE
-#define BSONCXX_INLINE inline __attribute__((__visibility__("hidden"), __always_inline__))
-
 #pragma push_macro("BSONCXX_UNREACHABLE")
 #undef BSONCXX_UNREACHABLE
 #define BSONCXX_UNREACHABLE std::abort()

src/mongocxx/config/compiler.hpp

@@ -0,0 +1,17 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO: DRY this definition with the one from bsoncxx/config/compiler.hpp per discussion
+//       here - https://github.com/mongodb/mongo-cxx-driver/pull/374#issuecomment-158179295
+#define MONGOCXX_INLINE inline __attribute__((__visibility__("hidden"), __always_inline__))

src/mongocxx/config/postlude.hpp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// src/mongocxx/config/compiler.hpp
+#undef MONGOCXX_INLINE
+#pragma pop_macro("MONGOCXX_INLINE")
+
 // src/mongocxx/config/config.hpp.in
 #undef MONGOCXX_INLINE_NAMESPACE_BEGIN
 #pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
@@ -45,7 +49,3 @@
 #pragma pop_macro("MONGOCXX_NO_DEPRECATED")
 #undef MONGOCXX_PRIVATE
 #pragma pop_macro("MONGOCXX_PRIVATE")
-
-// prelude.hpp
-#undef MONGOCXX_INLINE
-#pragma pop_macro("MONGOCXX_INLINE")

src/mongocxx/config/prelude.hpp

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// src/mongocxx/config/compiler.hpp
+#pragma push_macro("MONGOCXX_INLINE")
+#undef MONGOCXX_INLINE
+
 // src/mongocxx/config/config.hpp.in
 #pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
 #undef MONGOCXX_INLINE_NAMESPACE_BEGIN
@@ -46,11 +50,7 @@
 #pragma push_macro("MONGOCXX_PRIVATE")
 #undef MONGOCXX_PRIVATE
 
+#include <mongocxx/config/compiler.hpp>
 #include <mongocxx/config/config.hpp>
 #include <mongocxx/config/version.hpp>
 #include <mongocxx/export.hpp>
-
-// TODO to move this to a compiler.hpp header (CXX-733)
-#pragma push_macro("MONGOCXX_INLINE")
-#undef MONGOCXX_INLINE
-#define MONGOCXX_INLINE inline __attribute__ ((__visibility__("hidden"), __always_inline__))