windows.patch 1.1 KB

1234567891011121314151617181920212223242526
  1. diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
  2. index 6b401bfd..85add9f8 100644
  3. --- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
  4. +++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx
  5. @@ -307,7 +307,7 @@ int vtkHyperTreeGridThreshold::ProcessTrees(vtkHyperTreeGrid* input, vtkDataObje
  6. break;
  7. }
  8. - queue.Push(static_cast<int>(outIndex));
  9. + queue.Push(std::move(static_cast<int>(outIndex)));
  10. }
  11. queue.Flush();
  12. diff --git a/Rendering/UI/vtkWin32RenderWindowInteractor.cxx b/Rendering/UI/vtkWin32RenderWindowInteractor.cxx
  13. index f00daf39..00707611 100644
  14. --- a/Rendering/UI/vtkWin32RenderWindowInteractor.cxx
  15. +++ b/Rendering/UI/vtkWin32RenderWindowInteractor.cxx
  16. @@ -217,7 +217,7 @@ public:
  17. std::map<int, std::unique_ptr<TimerContext>> TimerContextMap;
  18. bool IsRunning = false;
  19. - static void OnTimerFired(PVOID lpParameter, BOOLEAN)
  20. + static void WINAPI OnTimerFired(PVOID lpParameter, BOOLEAN)
  21. {
  22. auto* timerContext = static_cast<TimerContext*>(lpParameter);
  23. // Do not post another message for the same timer if already posted