From dd34a1d1752afb604c9076dbfa8c96e21ee82fb4 Mon Sep 17 00:00:00 2001
From: ana <ana@opencascade.com>
Date: Wed, 10 Aug 2016 18:46:03 +0300
Subject: [PATCH] Windows compatibility

---
 src/evalyfx/YACSEvalPort.hxx          | 4 ++--
 src/ydfx_gui/YDFXGUIPortsSelector.cxx | 6 ++++++
 src/ydfx_gui/YDFXGUIPortsSelector.hxx | 2 +-
 src/ydfx_gui/YDFXGUIPushButtons.cxx   | 2 +-
 src/ydfx_gui/YDFXGUIPushButtons.hxx   | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/evalyfx/YACSEvalPort.hxx b/src/evalyfx/YACSEvalPort.hxx
index a463effee..af5c21ee4 100644
--- 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 8ccb05423..f54c4c094 100644
--- 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 bb0692b3d..f17c1b689 100644
--- 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 550f21790..b76d3d643 100644
--- 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 68e4f79cd..f5d1d1765 100644
--- 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();
-- 
2.39.2