From 77b3933f30e6796af99807b8adfc59515e8b8f47 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Tue, 2 Mar 2021 22:12:11 +0300
Subject: [PATCH] Compilation under Windows.

---
 src/SalomeApp/SalomeApp.h                        | 14 ++++++++++++++
 src/SalomeApp/SalomeApp_Application.h            |  2 +-
 src/SalomeApp/SalomeApp_Application_SL.h         |  2 +-
 src/SalomeApp/SalomeApp_Application_SL_Entry.cxx |  2 +-
 src/SalomeApp/SalomeApp_CheckFileDlg.h           |  2 +-
 src/SalomeApp/SalomeApp_DataModel.h              |  2 +-
 src/SalomeApp/SalomeApp_DataObject.h             | 10 +++++-----
 src/SalomeApp/SalomeApp_DoubleSpinBox.h          |  2 +-
 src/SalomeApp/SalomeApp_Engine_i.h               |  2 +-
 src/SalomeApp/SalomeApp_ExceptionHandler.cxx     |  2 +-
 src/SalomeApp/SalomeApp_ExceptionHandler.h       |  2 +-
 src/SalomeApp/SalomeApp_Filter.h                 |  2 +-
 src/SalomeApp/SalomeApp_IntSpinBox.h             |  2 +-
 src/SalomeApp/SalomeApp_LoadStudiesDlg.h         |  2 +-
 src/SalomeApp/SalomeApp_Module.h                 |  2 +-
 src/SalomeApp/SalomeApp_NoteBook.h               |  6 +++---
 src/SalomeApp/SalomeApp_Study.h                  |  2 +-
 src/SalomeApp/SalomeApp_StudyPropertiesDlg.h     |  2 +-
 src/SalomeApp/SalomeApp_Tools.h                  |  2 +-
 src/SalomeApp/SalomeApp_TypeFilter.h             |  2 +-
 src/SalomeApp/SalomeApp_VisualState.h            |  2 +-
 src/Session/Session_NS_wrapper.hxx               |  5 +++--
 src/Session/Session_Promises.hxx                 |  3 ++-
 23 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/SalomeApp/SalomeApp.h b/src/SalomeApp/SalomeApp.h
index b3180ce0f..bec190a83 100644
--- a/src/SalomeApp/SalomeApp.h
+++ b/src/SalomeApp/SalomeApp.h
@@ -38,8 +38,22 @@
 #define SALOMEAPP_EXPORT __declspec(dllimport)
 #endif
 
+#if defined SALOMEAPPIMPL_EXPORTS || defined SalomeAppImpl_EXPORTS
+#define SALOMEAPPIMPL_EXPORT __declspec(dllexport)
+#else
+#define SALOMEAPPIMPL_EXPORT __declspec(dllimport)
+#endif
+
+#if defined SALOMEAPPSL_EXPORTS || defined SalomeAppSL_EXPORTS
+#define SALOMEAPPSL_EXPORT __declspec(dllexport)
+#else
+#define SALOMEAPPSL_EXPORT __declspec(dllimport)
+#endif
+
 #else
 #define SALOMEAPP_EXPORT
+#define SALOMEAPPIMPL_EXPORT
+#define SALOMEAPPSL_EXPORT
 #endif               //WIN32
 
 #define APP_VERSION "0.1"
diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index a29b67c21..eaa6b7bee 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -64,7 +64,7 @@ class SALOME_LifeCycleCORBA;
   \brief Application containing SalomeApp module or LightApp module
 */
 
-class SALOMEAPP_EXPORT SalomeApp_Application : public LightApp_Application
+class SALOMEAPPIMPL_EXPORT SalomeApp_Application : public LightApp_Application
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_Application_SL.h b/src/SalomeApp/SalomeApp_Application_SL.h
index 9d9b735ac..c70c97b0b 100644
--- a/src/SalomeApp/SalomeApp_Application_SL.h
+++ b/src/SalomeApp/SalomeApp_Application_SL.h
@@ -21,7 +21,7 @@
 
 #include "SalomeApp_Application.h"
 
-class SALOMEAPP_EXPORT SalomeApp_Application_SL : public SalomeApp_Application
+class SALOMEAPPIMPL_EXPORT SalomeApp_Application_SL : public SalomeApp_Application
 {
 public:
   SalomeApp_Application_SL();
diff --git a/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx b/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
index 9094003cd..df068984a 100644
--- a/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
+++ b/src/SalomeApp/SalomeApp_Application_SL_Entry.cxx
@@ -20,7 +20,7 @@
 #include "SalomeApp_Application_SL.h"
 
 /*!Create new instance of SalomeApp_Application.*/
-extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication()
+extern "C" SALOMEAPPSL_EXPORT SUIT_Application* createApplication()
 {
   return new SalomeApp_Application_SL;
 }
diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index f47b1e920..16dbe4705 100644
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h
@@ -29,7 +29,7 @@
 
 class QCheckBox;
 
-class SALOMEAPP_EXPORT SalomeApp_CheckFileDlg : public SUIT_FileDlg
+class SALOMEAPPIMPL_EXPORT SalomeApp_CheckFileDlg : public SUIT_FileDlg
 {
   Q_OBJECT
     
diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 945b39223..c572f277f 100644
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.h
@@ -43,7 +43,7 @@ class LightApp_DataObject;
 
 //   Class       : SalomeApp_DataModel
 ///  Description : Base class of data model
-class SALOMEAPP_EXPORT SalomeApp_DataModel : public LightApp_DataModel
+class SALOMEAPPIMPL_EXPORT SalomeApp_DataModel : public LightApp_DataModel
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index 9925ec384..f26d0ae17 100644
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.h
@@ -32,7 +32,7 @@
 
 class SalomeApp_Study;
 
-class SALOMEAPP_EXPORT SalomeApp_DataObject : public virtual LightApp_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_DataObject : public virtual LightApp_DataObject
 {
 
 public:
@@ -85,7 +85,7 @@ private:
   _PTR(SObject)          myObject;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_ModuleObject : public SalomeApp_DataObject,
+class SALOMEAPPIMPL_EXPORT SalomeApp_ModuleObject : public SalomeApp_DataObject,
                                                 public CAM_ModuleObject
 {
 public:
@@ -99,7 +99,7 @@ public:
   QString                toolTip( const int = NameId ) const;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_RootObject : public SalomeApp_DataObject,
+class SALOMEAPPIMPL_EXPORT SalomeApp_RootObject : public SalomeApp_DataObject,
                                               public LightApp_RootObject
 {
 public:
@@ -118,7 +118,7 @@ protected:
   bool _toSynchronize;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_SavePointObject : public virtual LightApp_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_SavePointObject : public virtual LightApp_DataObject
 {
 public:
   SalomeApp_SavePointObject( SUIT_DataObject*, const int, SalomeApp_Study* );
@@ -137,7 +137,7 @@ private:
   SalomeApp_Study*       myStudy;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_SavePointRootObject : public SUIT_DataObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_SavePointRootObject : public SUIT_DataObject
 {
 public:
   SalomeApp_SavePointRootObject( SUIT_DataObject* );
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index ce1740451..f134f18fc 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -29,7 +29,7 @@
 
 #include <QValidator>
 
-class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
+class SALOMEAPPIMPL_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h
index 9de78b810..148b5b61c 100644
--- a/src/SalomeApp/SalomeApp_Engine_i.h
+++ b/src/SalomeApp/SalomeApp_Engine_i.h
@@ -40,7 +40,7 @@
 
 class SALOME_NamingService_Abstract;
 
-class SALOMEAPP_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine,
+class SALOMEAPPIMPL_EXPORT SalomeApp_Engine_i: public POA_SalomeApp::Engine,
 					   public Engines_Component_i
 {
 public:
diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index e9fa0f9af..9f2660813 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -98,7 +98,7 @@ bool SalomeApp_ExceptionHandler::handle( QObject* o, QEvent* e )
 }
 
 /*!Create new SUIT_ExceptionHandler*/
-extern "C" SALOMEAPP_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
+extern "C" SALOMEAPPIMPL_EXPORT SUIT_ExceptionHandler* getExceptionHandler()
 {
   // MSV 2006-04-26: work around PAL12004 "VTK window => SIGFPE Arithmetic Exception Detected"
   // We disable FPE signal as it was in earlier versions of SALOME. It is enabled
diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h
index d7efdaa66..3799855f2 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.h
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.h
@@ -27,7 +27,7 @@
 
 #include <SUIT_ExceptionHandler.h>
 
-class SALOMEAPP_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
+class SALOMEAPPIMPL_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
 {
 public:
   SalomeApp_ExceptionHandler( const bool );
diff --git a/src/SalomeApp/SalomeApp_Filter.h b/src/SalomeApp/SalomeApp_Filter.h
index 2d71c054e..786f73e0c 100644
--- a/src/SalomeApp/SalomeApp_Filter.h
+++ b/src/SalomeApp/SalomeApp_Filter.h
@@ -28,7 +28,7 @@
 
 class SalomeApp_Study;
 
-class SALOMEAPP_EXPORT SalomeApp_Filter: public SUIT_SelectionFilter
+class SALOMEAPPIMPL_EXPORT SalomeApp_Filter: public SUIT_SelectionFilter
 {
 public:
   SalomeApp_Filter(SalomeApp_Study* study);
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index a95fe6519..637455a71 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -29,7 +29,7 @@
 
 #include <QValidator>
 
-class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
+class SALOMEAPPIMPL_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
index b77fe5ec8..b2045dad6 100644
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
@@ -28,7 +28,7 @@ class QListWidget;
 class QPushButton;
 class QStringList;
 
-class SALOMEAPP_EXPORT SalomeApp_LoadStudiesDlg : public QDialog
+class SALOMEAPPIMPL_EXPORT SalomeApp_LoadStudiesDlg : public QDialog
 { 
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index d2ab53919..4af525341 100644
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_Module.h
@@ -41,7 +41,7 @@ class SUIT_DataObject;
 /*!
  * \brief Base class for all salome modules
  */
-class SALOMEAPP_EXPORT SalomeApp_Module : public LightApp_Module
+class SALOMEAPPIMPL_EXPORT SalomeApp_Module : public LightApp_Module
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_NoteBook.h b/src/SalomeApp/SalomeApp_NoteBook.h
index 6658ae025..aad9bd238 100644
--- a/src/SalomeApp/SalomeApp_NoteBook.h
+++ b/src/SalomeApp/SalomeApp_NoteBook.h
@@ -52,7 +52,7 @@ struct NoteBoox_Variable
 
 typedef QMap< int, NoteBoox_Variable > VariableMap;
 
-class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_TableRow : public QWidget
 {
  public:
   NoteBook_TableRow(int, NoteBook_Table* parentTable, QWidget* parent=0 );
@@ -88,7 +88,7 @@ class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
   QTableWidgetItem* myVariableValue;
 };
 
-class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
+class SALOMEAPPIMPL_EXPORT NoteBook_Table : public QTableWidget
 {
   Q_OBJECT
  public:
@@ -138,7 +138,7 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
   VariableMap myVariableMap;
 };
 
-class SALOMEAPP_EXPORT SalomeApp_NoteBook : public QWidget 
+class SALOMEAPPIMPL_EXPORT SalomeApp_NoteBook : public QWidget 
 {
   Q_OBJECT
  public:
diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 4e6c0763f..52b394f42 100644
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -33,7 +33,7 @@
 
 #include "SALOMEDSClient.hxx"
 
-class SALOMEAPP_EXPORT SalomeApp_Study : public LightApp_Study
+class SALOMEAPPIMPL_EXPORT SalomeApp_Study : public LightApp_Study
 {
   Q_OBJECT
 
diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index 81b27f2d1..27fd0a19a 100644
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -44,7 +44,7 @@ class QTextEdit;
 class QTreeWidget;
 class QPushButton;
 
-class SALOMEAPP_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog
+class SALOMEAPPIMPL_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog
 { 
   Q_OBJECT
 public:
diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h
index 3c485a250..8e476eb91 100644
--- a/src/SalomeApp/SalomeApp_Tools.h
+++ b/src/SalomeApp/SalomeApp_Tools.h
@@ -38,7 +38,7 @@ class Quantity_Color;
 /*! 
   Class which provide color converter and exception message box.
 */
-class SALOMEAPP_EXPORT SalomeApp_Tools : public SUIT_Tools
+class SALOMEAPPIMPL_EXPORT SalomeApp_Tools : public SUIT_Tools
 {
 public:
   static Quantity_Color  color( const QColor& );
diff --git a/src/SalomeApp/SalomeApp_TypeFilter.h b/src/SalomeApp/SalomeApp_TypeFilter.h
index b745b4191..539ad3acd 100644
--- a/src/SalomeApp/SalomeApp_TypeFilter.h
+++ b/src/SalomeApp/SalomeApp_TypeFilter.h
@@ -30,7 +30,7 @@
 /*!
   Class which provide data owner validation.
 */
-class SALOMEAPP_EXPORT SalomeApp_TypeFilter: public SalomeApp_Filter
+class SALOMEAPPIMPL_EXPORT SalomeApp_TypeFilter: public SalomeApp_Filter
 {
 public:
   SalomeApp_TypeFilter( SalomeApp_Study* study, const QString& kind );
diff --git a/src/SalomeApp/SalomeApp_VisualState.h b/src/SalomeApp/SalomeApp_VisualState.h
index c6f0af06b..80bfe6820 100644
--- a/src/SalomeApp/SalomeApp_VisualState.h
+++ b/src/SalomeApp/SalomeApp_VisualState.h
@@ -33,7 +33,7 @@
 
 class SalomeApp_Application;
 
-class SALOMEAPP_EXPORT SalomeApp_VisualState: public QObject
+class SALOMEAPPIMPL_EXPORT SalomeApp_VisualState: public QObject
 {
 public:
   SalomeApp_VisualState( SalomeApp_Application* );
diff --git a/src/Session/Session_NS_wrapper.hxx b/src/Session/Session_NS_wrapper.hxx
index 85518aff0..e7a62adda 100644
--- a/src/Session/Session_NS_wrapper.hxx
+++ b/src/Session/Session_NS_wrapper.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include "SALOME_NamingService.hxx"
+#include "SALOME_Session.hxx"
 
 #include "omniORB4/CORBA.h"
 
@@ -28,7 +29,7 @@ class QWaitCondition;
 
 class Engines_Container_i;
 
-class OldStyleNS
+class SESSION_EXPORT OldStyleNS
 {
 public:
   using RealNS = SALOME_NamingService;
@@ -51,7 +52,7 @@ private:
 
 #include "SALOME_Fake_NamingService.hxx"
 
-class NewStyleNS
+class SESSION_EXPORT NewStyleNS
 {
 public:
   using RealNS = SALOME_Fake_NamingService;
diff --git a/src/Session/Session_Promises.hxx b/src/Session/Session_Promises.hxx
index be471593e..87c1414d0 100644
--- a/src/Session/Session_Promises.hxx
+++ b/src/Session/Session_Promises.hxx
@@ -21,7 +21,8 @@
 
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOME_Session)
+#include "SALOME_Session.hxx"
 
 #include <future>
 
-std::promise<SALOME::Session_var> *GetSessionRefSingleton();
+SESSION_EXPORT std::promise<SALOME::Session_var> *GetSessionRefSingleton();
-- 
2.30.2