Disable C4251 and C4275 warnings for exception classes

Author: eramongodb

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp

@@ -36,12 +36,6 @@
 
 // clang-format on
 
-// Disable MSVC warnings that cause a lot of noise related to DLL visibility
-// for types that we don't control (like std::unique_ptr).
-BSONCXX_PUSH_WARNINGS();
-BSONCXX_DISABLE_WARNING(MSVC(4251));
-BSONCXX_DISABLE_WARNING(MSVC(5275));
-
 // For backward compatibility. Use `inline` instead.
 #define BSONCXX_INLINE inline BSONCXX_ABI_NO_EXPORT
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp

@@ -15,7 +15,6 @@
 // compiler.hpp
 #undef BSONCXX_INLINE
 #pragma pop_macro("BSONCXX_INLINE")
-BSONCXX_POP_WARNINGS();
 #undef BSONCXX_CALL
 #pragma pop_macro("BSONCXX_CALL")
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp

@@ -23,6 +23,10 @@
 namespace bsoncxx {
 namespace v_noabi {
 
+BSONCXX_PUSH_WARNINGS();
+BSONCXX_DISABLE_WARNING(MSVC(4251));
+BSONCXX_DISABLE_WARNING(MSVC(4275));
+
 ///
 /// Class representing any exceptions emitted from the bsoncxx library or
 /// its underlying implementation.
@@ -39,6 +43,8 @@ class exception : public std::system_error {
     using std::system_error::system_error;
 };
 
+BSONCXX_POP_WARNINGS();
+
 }  // namespace v_noabi
 }  // namespace bsoncxx
 

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp

@@ -12,17 +12,6 @@
 // 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
-#if defined(_MSC_VER)
-
-// Disable MSVC warnings that cause a lot of noise related to DLL visibility
-// for types that we don't control (like std::unique_ptr).
-#pragma warning(push)
-#pragma warning(disable : 4251 4275)
-
-#endif
-
 // For backward compatibility. Use `inline` instead.
 #define MONGOCXX_INLINE inline MONGOCXX_ABI_NO_EXPORT
 

src/mongocxx/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp

@@ -15,9 +15,6 @@
 // compiler.hpp
 #undef MONGOCXX_INLINE
 #pragma pop_macro("MONGOCXX_INLINE")
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
 #undef MONGOCXX_CALL
 #pragma pop_macro("MONGOCXX_CALL")
 

src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp

@@ -19,11 +19,16 @@
 
 #include <mongocxx/exception/exception-fwd.hpp>
 
+#include <bsoncxx/config/prelude.hpp>
 #include <mongocxx/config/prelude.hpp>
 
 namespace mongocxx {
 namespace v_noabi {
 
+BSONCXX_PUSH_WARNINGS();
+BSONCXX_DISABLE_WARNING(MSVC(4251));
+BSONCXX_DISABLE_WARNING(MSVC(4275));
+
 ///
 /// A class to be used as the base class for all mongocxx exceptions.
 ///
@@ -39,9 +44,12 @@ class exception : public std::system_error {
     using system_error::system_error;
 };
 
+BSONCXX_POP_WARNINGS();
+
 }  // namespace v_noabi
 }  // namespace mongocxx
 
+#include <bsoncxx/config/postlude.hpp>
 #include <mongocxx/config/postlude.hpp>
 
 ///

src/mongocxx/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp

@@ -23,11 +23,16 @@
 #include <mongocxx/exception/exception.hpp>
 #include <mongocxx/stdx.hpp>
 
+#include <bsoncxx/config/prelude.hpp>
 #include <mongocxx/config/prelude.hpp>
 
 namespace mongocxx {
 namespace v_noabi {
 
+BSONCXX_PUSH_WARNINGS();
+BSONCXX_DISABLE_WARNING(MSVC(4251));
+BSONCXX_DISABLE_WARNING(MSVC(4275));
+
 ///
 /// Class representing an exception received from a MongoDB server.  It includes the server-provided
 /// error code, if one was available.
@@ -84,9 +89,12 @@ class operation_exception : public exception {
     stdx::optional<bsoncxx::v_noabi::document::value> _raw_server_error;
 };
 
+BSONCXX_POP_WARNINGS();
+
 }  // namespace v_noabi
 }  // namespace mongocxx
 
+#include <bsoncxx/config/postlude.hpp>
 #include <mongocxx/config/postlude.hpp>
 
 ///

src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/index.hpp

@@ -27,6 +27,7 @@
 #include <bsoncxx/string/view_or_value.hpp>
 #include <mongocxx/stdx.hpp>
 
+#include <bsoncxx/config/prelude.hpp>
 #include <mongocxx/config/prelude.hpp>
 
 namespace mongocxx {
@@ -40,6 +41,10 @@ namespace options {
 ///
 class index {
    public:
+    BSONCXX_PUSH_WARNINGS();
+    BSONCXX_DISABLE_WARNING(MSVC(4251));
+    BSONCXX_DISABLE_WARNING(MSVC(4275));
+
     ///
     /// Base class representing the optional storage engine options for indexes.
     ///
@@ -97,6 +102,8 @@ class index {
         stdx::optional<bsoncxx::v_noabi::string::view_or_value> _config_string;
     };
 
+    BSONCXX_POP_WARNINGS();
+
     MONGOCXX_ABI_EXPORT_CDECL() index();
 
     ///
@@ -537,6 +544,7 @@ class index {
 }  // namespace v_noabi
 }  // namespace mongocxx
 
+#include <bsoncxx/config/postlude.hpp>
 #include <mongocxx/config/postlude.hpp>
 
 ///