Merge topic 'temporal-caching-for-ospray' into paraview/release

David E. DeMarle · kwrobot · commit d36b129d0a8b · 2018-03-20T12:01:10.000-04:00
b47f18e hide windows compilation warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4081
diff --git a/Rendering/OSPRay/vtkOSPRayVolumeCache.cxx b/Rendering/OSPRay/vtkOSPRayVolumeCache.cxx
@@ -17,8 +17,6 @@
 
 #include "ospray/ospray.h"
 
-#include <iostream>
-
 //------------------------------------------------------------------------------
 vtkOSPRayVolumeCache::vtkOSPRayVolumeCache()
 {
diff --git a/Rendering/OSPRay/vtkOSPRayVolumeCache.h b/Rendering/OSPRay/vtkOSPRayVolumeCache.h
@@ -27,6 +27,7 @@
 #define vtkOSPRayVolumeCache_h
 
 #include "vtkRenderingOSPRayModule.h" // For export macro
+#include "vtkSystemIncludes.h" //dll warning suppression
 #include <map> // for stl
 
 namespace osp

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`
`18`	`18`	`#include "ospray/ospray.h"`
`19`	`19`
`20`		`-#include <iostream>`
`21`		`-`
`22`	`20`	`//------------------------------------------------------------------------------`
`23`	`21`	`vtkOSPRayVolumeCache::vtkOSPRayVolumeCache()`
`24`	`22`	`{`