From: Christopher Dykes <cdykes@fb.com>
Date: Wed, 9 Nov 2016 23:13:25 +0000 (-0800)
Subject: Disable a couple of warnings generated by the GTest and GMock headers
X-Git-Tag: v2016.11.14.00~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1dcc41cf51197f9497b5e24f2f310a39649f3132;p=folly.git

Disable a couple of warnings generated by the GTest and GMock headers

Summary: As the comment says, this disables a couple of warnings related to exporting classes derived from stdlib classes that aren't explicitly exported.

Reviewed By: yfeldblum

Differential Revision: D4155978

fbshipit-source-id: 6e732b53c280a3bc3a39b2128cd577ba7cb70408
---

diff --git a/folly/portability/GMock.h b/folly/portability/GMock.h
index 9c9c880d..8b10d631 100755
--- a/folly/portability/GMock.h
+++ b/folly/portability/GMock.h
@@ -22,4 +22,12 @@
 #include <folly/portability/Unistd.h>
 #include <folly/portability/Windows.h>
 
+#include <folly/Portability.h>
+
+// Disable a couple of warnings due to GMock exporting classes
+// that derive from stdlib classes which aren't explicitly exported.
+FOLLY_PUSH_WARNING
+FOLLY_MSVC_DISABLE_WARNING(4251)
+FOLLY_MSVC_DISABLE_WARNING(4275)
 #include <gmock/gmock.h>
+FOLLY_POP_WARNING
diff --git a/folly/portability/GTest.h b/folly/portability/GTest.h
index 18396f16..80400662 100755
--- a/folly/portability/GTest.h
+++ b/folly/portability/GTest.h
@@ -22,4 +22,12 @@
 #include <folly/portability/Unistd.h>
 #include <folly/portability/Windows.h>
 
+#include <folly/Portability.h>
+
+// Disable a couple of warnings due to GTest exporting classes
+// that derive from stdlib classes which aren't explicitly exported.
+FOLLY_PUSH_WARNING
+FOLLY_MSVC_DISABLE_WARNING(4251)
+FOLLY_MSVC_DISABLE_WARNING(4275)
 #include <gtest/gtest.h>
+FOLLY_POP_WARNING