Merge from V6_4_0_BR (V6_4_0 tag) 14/12/2011

diff --git a/src/GEOM_I_Superv/GEOM_I_Superv.hxx b/src/GEOM_I_Superv/GEOM_I_Superv.hxx
new file mode 100755 (executable)
index 0000000..b13115a
--- /dev/null
+++ b/src/GEOM_I_Superv/GEOM_I_Superv.hxx
@@ -0,0 +1,41 @@
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : GEOM_I_Superv.hxx
+//  Author : Roman NIKOLAEV
+//  Module : GEOM
+//
+#ifndef _GEOM_I_SUPERV_HXX_
+#define _GEOM_I_SUPERV_HXX_
+
+#if defined WIN32
+#  if defined GEOM_I_Superv_EXPORTS || defined GEOM_SupervEngine_EXPORTS
+#    define GEOM_I_SUPERV_EXPORT __declspec( dllexport )
+#  else
+#    define GEOM_I_SUPERV_EXPORT __declspec( dllimport )
+#  endif
+#else
+#  define GEOM_I_SUPERV_EXPORT
+#endif
+
+
+#endif //_GEOM_I_SUPERV_HXX_

diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh
index dc1c63fc93c665e470ff2e7f7a7e61096a588229..940f02e9f6f1edd55c5957bb89db9ef626b8a7b4 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_List_i.hh
+++ b/src/GEOM_I_Superv/GEOM_List_i.hh
@@ -23,6 +23,8 @@
 #ifndef __GEOM_LIST_I_H__
 #define __GEOM_LIST_I_H__
 
+#include "GEOM_I_Superv.hxx"
+
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Superv)
@@ -31,7 +33,7 @@
 #include "utilities.h"
 
 template <class Type>
-class GEOM_List_i : 
+class GEOM_I_SUPERV_EXPORT GEOM_List_i : 
   public virtual POA_GEOM::GEOM_List,
   public virtual PortableServer::RefCountServantBase
 {

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index 1cf1761ee4d370ad6636cb16acedc126b8aecc40..f650a6e88f7ad50e562c8412f74647075d948689 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -3409,6 +3409,9 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition
 //=====================================================================================
 extern "C"
 {
+#ifdef WIN32
+  __declspec( dllexport )
+#endif
   PortableServer::ObjectId * GEOM_SupervEngine_factory(CORBA::ORB_ptr orb,
                                                        PortableServer::POA_ptr poa,
                                                        PortableServer::ObjectId * contId,

diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh
index d593be290c0aed0f8434bcb61e5d7e6929fcc8be..7b3591500c25c59300e348da62552db2f12947ce 100644 (file)
--- a/src/GEOM_I_Superv/GEOM_Superv_i.hh
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh
@@ -23,6 +23,8 @@
 #ifndef __GEOM_SUPERV_I_H__
 #define __GEOM_SUPERV_I_H__
 
+#include "GEOM_I_Superv.hxx"
+
 // IDL headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Superv)
@@ -30,8 +32,8 @@
 #include "GEOM_Gen_i.hh"
 #include "GEOM_List_i.hh"
 
-class GEOM_Superv_i : public virtual POA_GEOM::GEOM_Superv,
-                      public Engines_Component_i
+class GEOM_I_SUPERV_EXPORT GEOM_Superv_i : public virtual POA_GEOM::GEOM_Superv,
+                                           public Engines_Component_i
 {
 public:
   GEOM_Superv_i(CORBA::ORB_ptr orb,

diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am
index 9b0ec09bcf800706337d5eedb806e8e6bc9477e3..b9829b1cdc09d8e94f99ddd97bbe1c6e5fbefa1e 100644 (file)
--- a/src/GEOM_I_Superv/Makefile.am
+++ b/src/GEOM_I_Superv/Makefile.am
@@ -29,7 +29,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 # header files 
 salomeinclude_HEADERS = \
        GEOM_Superv_i.hh \
-       GEOM_List_i.hh
+       GEOM_List_i.hh \
+       GEOM_I_Superv.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOM_SupervEngine.la