Commit 3aeccaee authored by Ben Boeckel's avatar Ben Boeckel Committed by Code Review

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

2a17ac32 vtkDataArrayTemplate: fix support for compilers without explicit instantiation
parents e5f1f8ca 2a17ac32
......@@ -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 ' :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment