From 3b3fcaf820be179c2402e5ec798e8d944b830ac6 Mon Sep 17 00:00:00 2001
From: ana <ana@opencascade.com>
Date: Wed, 8 Oct 2014 16:47:47 +0400
Subject: [PATCH 1/1] Win32 compatibility

---
 src/engine/Test/ContainerTest.hxx        | 4 ++--
 src/genericgui/FormAdvParamContainer.hxx | 2 +-
 src/genericgui/FormHPContainer.cxx       | 2 +-
 src/runtime/PythonNode.hxx               | 2 +-
 src/runtime/SalomeContainerTools.cxx     | 5 +++++
 src/runtime/SalomeHPContainer.cxx        | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/engine/Test/ContainerTest.hxx b/src/engine/Test/ContainerTest.hxx
index 405127d60..d8f9c8e47 100644
--- a/src/engine/Test/ContainerTest.hxx
+++ b/src/engine/Test/ContainerTest.hxx
@@ -44,7 +44,7 @@ namespace YACS
       void addComponentName(const std::string& name) { }
       void shutdown(int level) { }
       void setProperty(const std::string& name,const std::string& value) { }
-      std::string getProperty(const std::string& name) const { }
+      std::string getProperty(const std::string& name) const { return ""; }
       std::map<std::string,std::string> getResourceProperties(const std::string& name) const { return std::map<std::string,std::string>(); }
       std::map<std::string,std::string> getProperties() const { return std::map<std::string,std::string>(); }
       //
@@ -77,7 +77,7 @@ namespace YACS
       void addComponentName(const std::string& name) { }
       void shutdown(int level) { }
       void setProperty(const std::string& name,const std::string& value) { }
-      std::string getProperty(const std::string& name) const { }
+      std::string getProperty(const std::string& name) const { return ""; }
       std::map<std::string,std::string> getResourceProperties(const std::string& name) const { return std::map<std::string,std::string>(); }
       std::map<std::string,std::string> getProperties() const { return std::map<std::string,std::string>(); }
       //
diff --git a/src/genericgui/FormAdvParamContainer.hxx b/src/genericgui/FormAdvParamContainer.hxx
index 7e55cee8a..1563a4b8a 100644
--- a/src/genericgui/FormAdvParamContainer.hxx
+++ b/src/genericgui/FormAdvParamContainer.hxx
@@ -48,7 +48,7 @@ public:
   void setModeText(const std::string& mode);
 
 public slots:
-  void onModifyName(const QString &text);
+//  void onModifyName(const QString &text);
   void onModifyResource(const QString &text);
   void onModifyPolicy(const QString &text);
   void onModifyWorkDir(const QString &text);
diff --git a/src/genericgui/FormHPContainer.cxx b/src/genericgui/FormHPContainer.cxx
index 9653e5cec..7f88f554b 100644
--- a/src/genericgui/FormHPContainer.cxx
+++ b/src/genericgui/FormHPContainer.cxx
@@ -41,7 +41,7 @@ using namespace std;
 
 FormHPContainer::FormHPContainer(QWidget *parent):FormContainerBase(parent),_poolSz(new QLineEdit(this)),_initScriptModified(false)
 {
-  QIntValidator *iv(new QIntValidator(_poolSz)); iv->setRange(1,std::numeric_limits<int>::max());
+  QIntValidator *iv(new QIntValidator(_poolSz)); iv->setRange(1,INT_MAX);
   _poolSz->setValidator(iv);
   label_15->setText("Size of pool :");
   gridLayout_2_2->addWidget(_poolSz);
diff --git a/src/runtime/PythonNode.hxx b/src/runtime/PythonNode.hxx
index c54232f2b..9026476e3 100644
--- a/src/runtime/PythonNode.hxx
+++ b/src/runtime/PythonNode.hxx
@@ -89,7 +89,7 @@ namespace YACS
       Engines::PyScriptNode_var _pynode;
     };
 
-    class PyFuncNode : public InlineFuncNode, public PythonEntry
+    class YACSRUNTIMESALOME_EXPORT PyFuncNode : public InlineFuncNode, public PythonEntry
     {
     protected:
       Node *simpleClone(ComposedNode *father, bool editionOnly) const;
diff --git a/src/runtime/SalomeContainerTools.cxx b/src/runtime/SalomeContainerTools.cxx
index 360e67eb1..e9ec945b3 100644
--- a/src/runtime/SalomeContainerTools.cxx
+++ b/src/runtime/SalomeContainerTools.cxx
@@ -35,6 +35,11 @@
 
 #include <sstream>
 
+#ifdef WIN32
+#include <process.h>
+#define getpid _getpid
+#endif
+
 using namespace YACS::ENGINE;
 
 SalomeContainerTools::SalomeContainerTools()
diff --git a/src/runtime/SalomeHPContainer.cxx b/src/runtime/SalomeHPContainer.cxx
index de5f1a461..32e82b3da 100644
--- a/src/runtime/SalomeHPContainer.cxx
+++ b/src/runtime/SalomeHPContainer.cxx
@@ -92,7 +92,7 @@ bool SalomeHPContainer::isAlreadyStarted(const Task *askingNode) const
   return helper->isAlreadyStarted(askingNode);
 }
 
-void SalomeHPContainer::start(const Task *askingNode) throw(Exception)
+void SalomeHPContainer::start(const Task *askingNode) throw(YACS::Exception)
 {
   SalomeContainerMonoHelper *helper(_launchModeType.getHelperOfTaskThreadSafe(this,askingNode));
   SalomeContainerTools::Start(_componentNames,helper,_sct,_shutdownLevel,this,askingNode);
-- 
2.30.2