From: Frederic Cervenansky <Frederic.Cervenansky@creatis.insa-lyon.fr>
Date: Wed, 27 Oct 2010 14:04:44 +0000 (+0000)
Subject: resolve conflict around round function
X-Git-Tag: ManualPaint~12
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b4e7e17891b612f7ab7a20aa9b6c615af1e23ea8;p=creaMaracasVisu.git

resolve conflict around round function
---

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 <mathdefs.h>
+using namespace gtm;
+#endif
 
 wxVtkMPR2DView::wxVtkMPR2DView( wxWindow *parent, int direction)
  :wxVtk2DBaseView(parent)