Merge from V6_main 01/04/2013

[modules/geom.git] / src / BREPImport / BREPImport.cxx

diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx
index 9153d14a399e54fff926f6442bf5f745f06d3fff..7064f3c130ea921cbf3d10a92a29cdb1b74aef85 100644 (file)
--- a/src/BREPImport/BREPImport.cxx
+++ b/src/BREPImport/BREPImport.cxx
@@ -1,27 +1,30 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2013  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 
+// 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 
+//
+// 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 
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       BREPImport.cxx
-// Created:    Wed May 19 14:29:52 2004
-// Author:     Pavel TELKOV
-//             <ptv@mutex.nnov.opencascade.com>
 
+// File:        BREPImport.cxx
+// Created:     Wed May 19 14:29:52 2004
+// Author:      Pavel TELKOV
+//              <ptv@mutex.nnov.opencascade.com>
+//
 #include "utilities.h"
 
 #include <BRepTools.hxx>
@@ -29,11 +32,24 @@
 
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
+#include <TDF_Label.hxx>
 
 #ifdef WNT
-#include <SALOME_WNT.hxx>
+ #if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS
+  #if defined WIN32
+   #define BREPIMPORT_EXPORT __declspec( dllexport )
+  #else
+   #define BREPIMPORT_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define BREPIMPORT_EXPORT __declspec( dllimport )
+  #else
+   #define BREPIMPORT_EXPORT
+  #endif
+ #endif
 #else
-#define SALOME_WNT_EXPORT
+ #define BREPIMPORT_EXPORT
 #endif
 
 //=============================================================================
@@ -44,10 +60,11 @@
 
 extern "C"
 {
-SALOME_WNT_EXPORT
+BREPIMPORT_EXPORT
   TopoDS_Shape Import (const TCollection_AsciiString& theFileName,
                        const TCollection_AsciiString& /*theFormatName*/,
-                       TCollection_AsciiString&       theError)
+                       TCollection_AsciiString&       theError,
+                       const TDF_Label&)
   {
     MESSAGE("Import BREP from file " << theFileName);
     TopoDS_Shape aShape;