From 756c7e1d1109f7eefbce0ae82369fad5a95fbf82 Mon Sep 17 00:00:00 2001
From: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Tue, 27 Feb 2018 13:42:52 -0500
Subject: [PATCH] selectively disable C4275.

---
 CMake/VTKmCompilerExtras.cmake |  3 ---
 vtkm/cont/AssignerMultiBlock.h | 10 ++++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMake/VTKmCompilerExtras.cmake b/CMake/VTKmCompilerExtras.cmake
index 5d564f263..f095732c7 100644
--- a/CMake/VTKmCompilerExtras.cmake
+++ b/CMake/VTKmCompilerExtras.cmake
@@ -95,7 +95,4 @@ elseif (CMAKE_COMPILER_IS_MSVCXX)
   else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
   endif()
-
-  # disable C4275: non-dll interface base class warnings
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
 endif()
diff --git a/vtkm/cont/AssignerMultiBlock.h b/vtkm/cont/AssignerMultiBlock.h
index 2294e4e20..2d402cbb6 100644
--- a/vtkm/cont/AssignerMultiBlock.h
+++ b/vtkm/cont/AssignerMultiBlock.h
@@ -34,6 +34,12 @@ VTKM_THIRDPARTY_PRE_INCLUDE
 VTKM_THIRDPARTY_POST_INCLUDE
 // clang-format on
 
+#ifdef VTKM_MSVC
+#pragma warning(push)
+// disable C4275: non-dll interface base class warnings
+#pragma warning(disable : 4275)
+#endif
+
 namespace vtkm
 {
 namespace cont
@@ -76,4 +82,8 @@ private:
 }
 }
 
+#ifdef VTKM_MSVC
+#pragma warning(pop)
+#endif
+
 #endif