From b4e7e17891b612f7ab7a20aa9b6c615af1e23ea8 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Wed, 27 Oct 2010 14:04:44 +0000 Subject: [PATCH] resolve conflict around round function --- .../src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx index 32d4fc3..13ed4a8 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR2DView.cxx @@ -3,6 +3,10 @@ #include "vtkInteractorStyleBaseView.h" #include "vtkCellArray.h" +#ifdef WIN32 +#include +using namespace gtm; +#endif wxVtkMPR2DView::wxVtkMPR2DView( wxWindow *parent, int direction) :wxVtk2DBaseView(parent) -- 2.45.1