Merge pull request #9122 from ivsgroup:fix_msvc_virtual_destructor

e251ed77 · Alexander Alekhin · 0e6ebafd · 309c9621 · e251ed77
Commit e251ed77 authored Jul 14, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

bufferpool.hpp modules/core/include/opencv2/core/bufferpool.hpp +9 -0

No files found.
--- a/modules/core/include/opencv2/core/bufferpool.hpp
+++ b/modules/core/include/opencv2/core/bufferpool.hpp
@@ -7,6 +7,11 @@
 #ifndef OPENCV_CORE_BUFFER_POOL_HPP
 #define OPENCV_CORE_BUFFER_POOL_HPP

+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4265)
+#endif
+
 namespace cv
 {

@@ -28,4 +33,8 @@ public:

 }

+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // OPENCV_CORE_BUFFER_POOL_HPP