From 014a6ddcfe37657a43ec1417f6fa5c5982568667 Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Thu, 31 Oct 2013 12:37:43 +0000
Subject: [PATCH] Porting HEXABLOCKPLUGIN SALOME module on WIN32 platform.

---
 .../HEXABLOCKPluginGUI_HypothesisCreator.h    |  2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx  |  8 +++----
 .../HEXABLOCKPlugin_FromSkin_3D.hxx           |  3 ++-
 .../HEXABLOCKPlugin_HEXABLOCK.hxx             |  3 ++-
 .../HEXABLOCKPlugin_HEXABLOCK_i.hxx           |  3 ++-
 .../HEXABLOCKPlugin_Hypothesis.hxx            |  6 ++---
 .../HEXABLOCKPlugin_Hypothesis_i.hxx          |  2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx     |  2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx  | 23 +++++++++----------
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx  | 13 ++---------
 10 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
index 2817ceb..a748e5f 100755
--- a/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
+++ b/src/GUI/HEXABLOCKPluginGUI_HypothesisCreator.h
@@ -26,7 +26,7 @@
 #define HEXABLOCKPLUGINGUI_HypothesisCreator_HeaderFile
 
 #ifdef WIN32
-  #if defined HEXABLOCKPluginGUI_EXPORTS
+  #if defined HEXABLOCKPLUGINGUI_EXPORTS || defined HEXABLOCKPluginGUI_EXPORTS
     #define HEXABLOCKPLUGINGUI_EXPORT __declspec( dllexport )
   #else
     #define HEXABLOCKPLUGINGUI_EXPORT __declspec( dllimport )
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
index cd305d1..ed0a8a4 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Defs.hxx
@@ -25,13 +25,13 @@
 #define _HEXABLOCKPlugin_DEFS_HXX_
 
 #ifdef WIN32
-  #if defined HEXABLOCKPLUGIN_EXPORTS || defined HEXABLOCKEngine_EXPORTS
-    #define HEXABLOCKPLUGIN_EXPORT __declspec( dllexport )
+  #if defined HEXABLOCKENGINE_EXPORTS || defined HexaBlockEngine_EXPORTS
+    #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllexport )
   #else
-    #define HEXABLOCKPLUGIN_EXPORT __declspec( dllimport )
+    #define HEXABLOCKPLUGINENGINE_EXPORT __declspec( dllimport )
   #endif
 #else
-  #define HEXABLOCKPLUGIN_EXPORT
+  #define HEXABLOCKPLUGINENGINE_EXPORT
 #endif
 
 #endif
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
index a209dc3..a4a972f 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
@@ -24,6 +24,7 @@
 #ifndef __SMESH_HexaFromSkin_3D_HXX__
 #define __SMESH_HexaFromSkin_3D_HXX__
 
+#include "HEXABLOCKPlugin_Defs.hxx"
 #include "SMESH_StdMeshers.hxx"
 #include "SMESH_Algo.hxx"
 
@@ -40,7 +41,7 @@
  * \brief Alorithm generating hexahedral mesh from 2D skin of block
  */
 
-class STDMESHERS_EXPORT SMESH_HexaFromSkin_3D : public SMESH_3D_Algo
+class HEXABLOCKPLUGINENGINE_EXPORT SMESH_HexaFromSkin_3D : public SMESH_3D_Algo
 {
 public:
 //   SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen);
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
index 82d7a92..0236aae 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
@@ -27,13 +27,14 @@
 #ifndef _HEXABLOCKPlugin_HEXABLOCK_HXX_
 #define _HEXABLOCKPlugin_HEXABLOCK_HXX_
 
+#include "HEXABLOCKPlugin_Defs.hxx"
 #include "SMESH_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 
 class SMESH_Mesh;
 class HEXABLOCKPlugin_Hypothesis;
 
-class HEXABLOCKPlugin_HEXABLOCK: public SMESH_3D_Algo
+class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_HEXABLOCK: public SMESH_3D_Algo
 {
 public:
   HEXABLOCKPlugin_HEXABLOCK(int hypId, int studyId, SMESH_Gen* gen);
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
index 6395c69..d528f45 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.hxx
@@ -29,13 +29,14 @@
 #include CORBA_SERVER_HEADER(HEXABLOCKPlugin_Algorithm)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
+#include "HEXABLOCKPlugin_Defs.hxx"
 #include "SMESH_3D_Algo_i.hxx"
 #include "HEXABLOCKPlugin_HEXABLOCK.hxx"
 
 // ======================================================
 // HEXABLOCK 3d algorithm
 // ======================================================
-class HEXABLOCKPlugin_HEXABLOCK_i:
+class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_HEXABLOCK_i:
   public virtual POA_HEXABLOCKPlugin::HEXABLOCKPlugin_HEXABLOCK,
   public virtual SMESH_3D_Algo_i
 {
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
index 0bc82e2..959e922 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis.hxx
@@ -36,7 +36,7 @@
 #include <stdexcept>
 #include <cstdio>
 
-class HEXABLOCKPLUGIN_EXPORT HEXABLOCKPlugin_Hypothesis: public SMESH_Hypothesis
+class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_Hypothesis: public SMESH_Hypothesis
 {
 public:
 
@@ -61,8 +61,8 @@ public:
   // Persistence
   virtual std::ostream & SaveTo(std::ostream & save);
   virtual std::istream & LoadFrom(std::istream & load);
-  friend HEXABLOCKPLUGIN_EXPORT std::ostream & operator <<(std::ostream & save, HEXABLOCKPlugin_Hypothesis & hyp);
-  friend HEXABLOCKPLUGIN_EXPORT std::istream & operator >>(std::istream & load, HEXABLOCKPlugin_Hypothesis & hyp);
+  friend HEXABLOCKPLUGINENGINE_EXPORT std::ostream & operator <<(std::ostream & save, HEXABLOCKPlugin_Hypothesis & hyp);
+  friend HEXABLOCKPLUGINENGINE_EXPORT std::istream & operator >>(std::istream & load, HEXABLOCKPlugin_Hypothesis & hyp);
 
   /*!
    * \brief Does nothing
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
index 0517dec..3ee0fee 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.hxx
@@ -38,7 +38,7 @@ class SMESH_Gen;
 
 // HEXABLOCKPlugin parameters hypothesis
 
-class HEXABLOCKPLUGIN_EXPORT HEXABLOCKPlugin_Hypothesis_i:
+class HEXABLOCKPLUGINENGINE_EXPORT HEXABLOCKPlugin_Hypothesis_i:
   public virtual POA_HEXABLOCKPlugin::HEXABLOCKPlugin_Hypothesis,
   public virtual SMESH_Hypothesis_i
 {
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
index ee7ee7f..d04117d 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
@@ -54,7 +54,7 @@ template <class T> class HEXABLOCKPlugin_Creator_i:public HypothesisCreator_i<T>
 
 extern "C"
 {
-  HEXABLOCKPLUGIN_EXPORT
+  HEXABLOCKPLUGINENGINE_EXPORT
   GenericHypothesisCreator_i* GetHypothesisCreator (const char* aHypName)
   {
     if(MYDEBUG) MESSAGE("GetHypothesisCreator " << aHypName);
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
index ccf971f..345c7f3 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
@@ -25,7 +25,6 @@
 #include <algorithm>
 
 // CasCade includes
-#include <AIS_Shape.hxx>
 
 #include <Precision.hxx>
 #include <BRep_Tool.hxx>
@@ -445,12 +444,12 @@ std::map<HEXA_NS::Quad*, bool>  SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu
     if(MYDEBUG) MESSAGE("SEARCHING INITIAL QUAD ..." );
     for ( std::list<HEXA_NS::Quad*>::iterator it = skinQuad.begin(); it != skinQuad.end(); it++ ){
         _searchInitialQuadWay( *it, e_0, e_1 );
-        if ( e_0 != NULL and e_1 != NULL ){
+        if ( e_0 != NULL && e_1 != NULL ){
           q = first_q = *it;
           break;
         }
     }
-    if ( e_0 == NULL and e_1 == NULL ) ASSERT(false);// should never happened,
+    if ( e_0 == NULL && e_1 == NULL ) ASSERT(false);// should never happened,
     if(MYDEBUG) MESSAGE("INITIAL QUAD FOUND!" );
     for ( int j=0 ; j < 4 ; ++j ){
       e = q->getEdge(j);
@@ -1352,7 +1351,7 @@ gp_Pnt SMESH_HexaBlocks::_getPtOnMyCurve(
     MESSAGE("looking for curve: curve_lenght = "<<myCurve_lengths[curve]);
     MESSAGE("looking for curve: curve.size _lenght= "<<myCurve_list.size());
   }
-  while ( not ( (myCurve_u >= curve_start) and  (myCurve_u <= curve_end) ) ) {
+  while ( !( (myCurve_u >= curve_start) &&  (myCurve_u <= curve_end) ) ) {
 
     ASSERT( myCurve_list.size() != 0 );
     myCurve_list.pop_front();
@@ -1533,21 +1532,21 @@ void SMESH_HexaBlocks::_searchInitialQuadWay( HEXA_NS::Quad* q, HEXA_NS::Vertex*
     HEXA_NS::Vertex* e0 = e->getVertex(0);
     HEXA_NS::Vertex* e1 = e->getVertex(1);
 
-    if ( e0 == qA and e1 != qB and e1 != qC and e1 != qD ){
+    if ( e0 == qA && e1 != qB && e1 != qC && e1 != qD ){
       qAA = e1;
-    } else if ( e1 == qA and e0 != qB and e0 != qC and e0 != qD ){
+    } else if ( e1 == qA && e0 != qB && e0 != qC && e0 != qD ){
       qAA = e0;
-    } else if ( e0 == qB and e1 != qA and e1 != qC and e1 != qD ){
+    } else if ( e0 == qB && e1 != qA && e1 != qC && e1 != qD ){
       qBB = e1;
-    } else if ( e1 == qB and e0 != qA and e0 != qC and e0 != qD ){
+    } else if ( e1 == qB && e0 != qA && e0 != qC && e0 != qD ){
       qBB = e0;
-    } else if ( e0 == qC and e1 != qA and e1 != qB and e1 != qD ){
+    } else if ( e0 == qC && e1 != qA && e1 != qB && e1 != qD ){
       qCC = e1;
-    } else if ( e1 == qC and e0 != qA and e0 != qB and e0 != qD ){
+    } else if ( e1 == qC && e0 != qA && e0 != qB && e0 != qD ){
       qCC = e0;
-    } else if ( e0 == qD and e1 != qA and e1 != qB and e1 != qC ){
+    } else if ( e0 == qD && e1 != qA && e1 != qB && e1 != qC ){
       qDD = e1;
-    } else if ( e1 == qD and e0 != qA and e0 != qB and e0 != qC ){
+    } else if ( e1 == qD && e0 != qA && e0 != qB && e0 != qC ){
       qDD = e0;
     }
   }
diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
index 57b43a3..6b43936 100755
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.hxx
@@ -24,16 +24,7 @@
 #define _SMESH_HexaBlocks_HeaderFile
 
 #include <SALOMEconfig.h>
-
-#ifdef WNT
-# if defined HEXABLOCKS_EXPORTS || defined HexaBlocks_EXPORTS
-#  define HEXABLOCKS_EXPORT __declspec( dllexport )
-# else
-#  define HEXABLOCKS_EXPORT __declspec( dllimport )
-# endif
-#else
-# define HEXABLOCKS_EXPORT
-#endif
+#include "HEXABLOCKPlugin_Defs.hxx"
 
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Group.hxx"
@@ -53,7 +44,7 @@
 //=====================================================================
 // SMESH_HexaBlocks : class definition
 //=====================================================================
-class HEXABLOCKS_EXPORT SMESH_HexaBlocks
+class HEXABLOCKPLUGINENGINE_EXPORT SMESH_HexaBlocks
 {
 public:
 
-- 
2.39.2