Windows compatibility

diff --git a/src/evalyfx/YACSEvalPort.hxx b/src/evalyfx/YACSEvalPort.hxx
index a463effee5ffe0c8ebb95f1158fcc0a0d7111e96..af5c21ee481fe8496e6a9acc8618b899fe2d9742 100644 (file)
--- a/src/evalyfx/YACSEvalPort.hxx
+++ b/src/evalyfx/YACSEvalPort.hxx
@@ -61,7 +61,7 @@ public:
 private:
   double _v;
 public:
-  static const char TYPE_REPR[];
+  YACSEVALYFX_EXPORT static const char TYPE_REPR[];
 };
 
 class YACSEvalAnyInt : public YACSEvalAny
@@ -76,7 +76,7 @@ public:
 private:
   int _v;
 public:
-  static const char TYPE_REPR[];
+  YACSEVALYFX_EXPORT static const char TYPE_REPR[];
 };
 
 class YACSEvalPort

diff --git a/src/ydfx_gui/YDFXGUIPortsSelector.cxx b/src/ydfx_gui/YDFXGUIPortsSelector.cxx
index 8ccb05423c6ca184e4c146196ad44071a472f294..f54c4c0943b497650dde5d49177460a2da17ccbf 100644 (file)
--- a/src/ydfx_gui/YDFXGUIPortsSelector.cxx
+++ b/src/ydfx_gui/YDFXGUIPortsSelector.cxx
@@ -38,7 +38,13 @@
 #include <string>
 #include <iostream>
 #include <limits>
+
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#include <math.h>
+#else
 #include <cmath>
+#endif
 
 const int MyWidgetPainter::SZ_OF_PEN_RECT=2;
 const int MyWidgetPainter::PADLOCK_X=130;

diff --git a/src/ydfx_gui/YDFXGUIPortsSelector.hxx b/src/ydfx_gui/YDFXGUIPortsSelector.hxx
index bb0692b3d54069e87e653c91916d529e752ef4d6..f17c1b689af4807a978f06f4f10de5a1b8c84e96 100644 (file)
--- a/src/ydfx_gui/YDFXGUIPortsSelector.hxx
+++ b/src/ydfx_gui/YDFXGUIPortsSelector.hxx
@@ -222,7 +222,7 @@ class YDFXGUIOKCls
 public:
   YDFXWIDGETS_EXPORT YDFXGUIOKCls():_isOK(false) { }
   YDFXWIDGETS_EXPORT bool wasOK() const { return _isOK; }
-  YDFXWIDGETS_EXPORT bool setWasOKStatus(bool newStatus) { _isOK=newStatus; }
+  YDFXWIDGETS_EXPORT void setWasOKStatus(bool newStatus) { _isOK=newStatus; }
   YDFXWIDGETS_EXPORT virtual bool isOK() const = 0;
 protected:
   void initOK();

diff --git a/src/ydfx_gui/YDFXGUIPushButtons.cxx b/src/ydfx_gui/YDFXGUIPushButtons.cxx
index 550f21790ebce74b3e13704793dcb9f83eb13333..b76d3d6438e81b6e62a4cd32e359dfd412095f19 100644 (file)
--- a/src/ydfx_gui/YDFXGUIPushButtons.cxx
+++ b/src/ydfx_gui/YDFXGUIPushButtons.cxx
@@ -155,7 +155,7 @@ int YDFXGUIRunInfo::getNbOfItems() const
   return ret;
 }
 
-int YDFXGUIRunInfo::setNbOfItems(int nbOfItems)
+void YDFXGUIRunInfo::setNbOfItems(int nbOfItems)
 {
   _items.resize(nbOfItems);
   std::fill(_items.begin(),_items.end(),0);

diff --git a/src/ydfx_gui/YDFXGUIPushButtons.hxx b/src/ydfx_gui/YDFXGUIPushButtons.hxx
index 68e4f79cd82916d13ccb54b2eecc1206518474b1..f5d1d1765fd0efbf706156b60571159a75ab79f4 100644 (file)
--- a/src/ydfx_gui/YDFXGUIPushButtons.hxx
+++ b/src/ydfx_gui/YDFXGUIPushButtons.hxx
@@ -86,7 +86,7 @@ public:
   YDFXWIDGETS_EXPORT YDFXGUIRunInfo(QObject *parent, int nbOfItems);
   YDFXWIDGETS_EXPORT std::vector<char> getItems() const;
   YDFXWIDGETS_EXPORT int getNbOfItems() const;
-  YDFXWIDGETS_EXPORT int setNbOfItems(int nbOfItems);
+  YDFXWIDGETS_EXPORT void setNbOfItems(int nbOfItems);
   YDFXWIDGETS_EXPORT bool getComputationStatus() const;
 public slots:
   YDFXWIDGETS_EXPORT void startComputation();