msvc.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. diff --git a/Common/Core/SMP/Common/vtkSMPToolsImpl.h b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  2. index f336f1fe2d2..8ed35c982d5 100644
  3. --- a/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  4. +++ b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  5. @@ -62,7 +62,7 @@ public:
  6. bool GetNestedParallelism() { return this->NestedActivated; }
  7. //--------------------------------------------------------------------------------
  8. - bool IsParallelScope() { return this->IsParallel; }
  9. + bool IsParallelScope();
  10. //--------------------------------------------------------------------------------
  11. bool GetSingleThread();
  12. @@ -118,6 +118,12 @@ private:
  13. std::atomic<bool> IsParallel{ false };
  14. };
  15. +template <BackendType Backend>
  16. +bool vtkSMPToolsImpl<Backend>::IsParallelScope()
  17. +{
  18. + return this->IsParallel;
  19. +}
  20. +
  21. using ExecuteFunctorPtrType = void (*)(void*, vtkIdType, vtkIdType, vtkIdType);
  22. VTK_ABI_NAMESPACE_END
  23. diff --git a/Common/Core/SMP/Common/vtkSMPToolsImpl.h b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  24. index 8ed35c982d5..d2a4a377adc 100644
  25. --- a/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  26. +++ b/Common/Core/SMP/Common/vtkSMPToolsImpl.h
  27. @@ -43,7 +43,7 @@ const BackendType DefaultBackend = BackendType::OpenMP;
  28. #endif
  29. template <BackendType Backend>
  30. -class VTKCOMMONCORE_EXPORT vtkSMPToolsImpl
  31. +class vtkSMPToolsImpl
  32. {
  33. public:
  34. //--------------------------------------------------------------------------------
  35. diff --git a/Utilities/octree/octree/octree_node.txx b/Utilities/octree/octree/octree_node.txx
  36. index 6971c7c1199..5f12bb7de76 100644
  37. --- a/Utilities/octree/octree/octree_node.txx
  38. +++ b/Utilities/octree/octree/octree_node.txx
  39. @@ -210,7 +210,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_>::operator[](int child) co
  40. {
  41. throw std::domain_error("Attempt to access children of an octree leaf node.");
  42. }
  43. - return this->_M_chilren[child];
  44. + return this->m_children[child];
  45. }
  46. /**\brief Return a reference to a child node.