Merge topic 'fix-data-arrays-with-no-explicit-instances' into master

2a17ac32 vtkDataArrayTemplate: fix support for compilers without explicit instantiation

Merge topic 'fix-data-arrays-with-no-explicit-instances' into master
2a17ac32 vtkDataArrayTemplate: fix support for compilers without explicit instantiation
3aeccaee · Ben Boeckel · Code Review · e5f1f8ca · 2a17ac32 · 3aeccaee
Commit 3aeccaee authored Jan 14, 2015 by Ben Boeckel Committed by Code Review Jan 14, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Common/Core/vtkDataArrayTemplate.h Common/Core/vtkDataArrayTemplate.h +1 -1

No files found.
--- a/Common/Core/vtkDataArrayTemplate.h
+++ b/Common/Core/vtkDataArrayTemplate.h
@@ -406,7 +406,7 @@ private:
 // This portion must be OUTSIDE the include blockers.  Each
 // vtkDataArray subclass uses this to give its instantiation of this
 // template a DLL interface.
-#if defined(VTK_DATA_ARRAY_TEMPLATE_TYPE)
+#if defined(VTK_DATA_ARRAY_TEMPLATE_TYPE) && !defined(VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
 # if defined(VTK_BUILD_SHARED_LIBS) && defined(_MSC_VER)
 #  pragma warning (push)
 #  pragma warning (disable: 4091) // warning C4091: 'extern ' :