Win32 compatibility

diff --git a/src/engine/Test/ContainerTest.hxx b/src/engine/Test/ContainerTest.hxx
index 405127d60b62a7f38a41ac6e403da343b964471b..d8f9c8e47f4c3d446eaca1bdfe7a59f824a5ad12 100644 (file)
--- 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 7e55cee8aac3bb5274157bd7bf3d966feb0a74b2..1563a4b8abdc5cb202203cb62b2234089a29bb8a 100644 (file)
--- 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 9653e5cec4641a97710f1e59dfb48fa8ea7cf98e..7f88f554b80dd6dd2b93e42e5b4d486ee820a588 100644 (file)
--- 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 c54232f2b0008dd278dc41bfcc68080183500752..9026476e302fe31f5192af6b2af9b607b776b952 100644 (file)
--- 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 360e67eb18cf69b226debbc8ade9f4011fbe216b..e9ec945b31f4ec01954e5a4f87a83a40b91758cc 100644 (file)
--- 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 de5f1a46198be4ef9561137fdc471374c8bc82c7..32e82b3daac7b7ab906c9eeb4f745ed8842160ec 100644 (file)
--- 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);