From 687576f8a8490a61fa3fed3645c8dbf4de38a6c0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 13 Sep 2016 17:29:34 +0300 Subject: [PATCH] Windows compatibility. --- src/MEDCalc/cmp/MED.cxx | 2 +- src/MEDCalc/cmp/MED.hxx | 2 +- src/MEDCalc/gui/dialogs/CMakeLists.txt | 2 +- src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/MEDCalc/cmp/MED.cxx b/src/MEDCalc/cmp/MED.cxx index 5ce6dac6f..0565faee5 100644 --- a/src/MEDCalc/cmp/MED.cxx +++ b/src/MEDCalc/cmp/MED.cxx @@ -325,7 +325,7 @@ MED::getStudyPresentations(SALOMEDS::Study_ptr study) } char* -MED::getStudyPresentationEntry(SALOMEDS::Study_ptr study, int presentationId) +MED::getStudyPresentationEntry(SALOMEDS::Study_ptr study, CORBA::Long presentationId) { // set exception handler to catch unexpected CORBA exceptions Unexpect aCatch(SALOME_SalomeException); diff --git a/src/MEDCalc/cmp/MED.hxx b/src/MEDCalc/cmp/MED.hxx index fb78501ca..115e9e268 100644 --- a/src/MEDCalc/cmp/MED.hxx +++ b/src/MEDCalc/cmp/MED.hxx @@ -79,7 +79,7 @@ public: // Get all presentations registered in the study MED_ORB::PresentationsList* getStudyPresentations(SALOMEDS::Study_ptr study); - char* getStudyPresentationEntry(SALOMEDS::Study_ptr study, int presentationId); + char* getStudyPresentationEntry(SALOMEDS::Study_ptr study, CORBA::Long presentationId); void cleanUp(); diff --git a/src/MEDCalc/gui/dialogs/CMakeLists.txt b/src/MEDCalc/gui/dialogs/CMakeLists.txt index 9964eea5b..b49f72b8f 100644 --- a/src/MEDCalc/gui/dialogs/CMakeLists.txt +++ b/src/MEDCalc/gui/dialogs/CMakeLists.txt @@ -58,7 +58,7 @@ SET(MEDCALCGUI_dialogs_SOURCES ADD_LIBRARY(MEDCALCGUI_dialogs SHARED ${MEDCALCGUI_dialogs_SOURCES} ${MEDCALCGUI_dialogs_HEADERS_MOC} ${MEDCALCGUI_dialogs_FORMS_HEADERS}) TARGET_LINK_LIBRARIES(MEDCALCGUI_dialogs SalomeIDLMED ${QT_LIBRARIES} ${KERNEL_SalomeIDLKernel} ${GUI_SalomeGuiHelpers} ${OMNIORB_LIBRARIES} ${GUI_qtx} ${GUI_suit} ${PLATFORM_LIBRARIES} - ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers} ${GUI_SalomeGuiHelpers}) + ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers} ${GUI_SalomeGuiHelpers} ${KERNEL_SalomeDS}) INSTALL(TARGETS MEDCALCGUI_dialogs DESTINATION ${SALOME_INSTALL_LIBS}) # diff --git a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx index 8faec9df2..d9297d173 100644 --- a/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx +++ b/src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx @@ -17,6 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // +#ifdef WIN32 +#define NOMINMAX +#endif + #include "WidgetPresentationParameters.hxx" #include -- 2.30.2