Merge from V6_main 06/03/2013

[modules/geom.git] / src / GEOMImpl / GEOMImpl_Gen.hxx

diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx
index 3e3e113cfa5b32fb56cc42f8736d66973e97b022..8378dbe5518d47e06d26039cd1c11b191fdea7cf 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_Gen.hxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.hxx
@@ -1,18 +1,20 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2012  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/ or email : webmaster.salome@opencascade.com
@@ -21,6 +23,8 @@
 #ifndef _GEOMImpl_GEN_HXX_
 #define _GEOMImpl_GEN_HXX_
 
+#include <GEOM_GEOMImpl.hxx>
+
 #include <map>
 
 #include "GEOMImpl_IBasicOperations.hxx"
@@ -35,15 +39,10 @@
 #include "GEOMImpl_IInsertOperations.hxx"
 #include "GEOMImpl_IMeasureOperations.hxx"
 #include "GEOMImpl_IGroupOperations.hxx"
+#include "GEOMImpl_IAdvancedOperations.hxx"
 #include "GEOM_Engine.hxx"
 
-#ifdef WNT
-#include <SALOME_WNT.hxx>
-#else
-#define SALOME_WNT_EXPORT 
-#endif
-
-class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine
+class GEOMIMPL_EXPORT GEOMImpl_Gen : public GEOM_Engine
 {
  public:
   GEOMImpl_Gen();
@@ -73,6 +72,8 @@ class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine
 
   GEOMImpl_IGroupOperations* GetIGroupOperations(int theDocID);
 
+  GEOMImpl_IAdvancedOperations* GetIAdvancedOperations(int theDocID);
+
  private:
 
   std::map <int, GEOMImpl_IBasicOperations*>     _mapOfBasicOperations;
@@ -86,7 +87,8 @@ class SALOME_WNT_EXPORT GEOMImpl_Gen : public GEOM_Engine
   std::map <int, GEOMImpl_ILocalOperations*>     _mapOfLocalOperations;
   std::map <int, GEOMImpl_IInsertOperations*>    _mapOfInsertOperations;
   std::map <int, GEOMImpl_IMeasureOperations*>   _mapOfMeasureOperations;
-  std::map <int, GEOMImpl_IGroupOperations*>   _mapOfGroupOperations;
+  std::map <int, GEOMImpl_IGroupOperations*>     _mapOfGroupOperations;
+  std::map <int, GEOMImpl_IAdvancedOperations*>  _mapOfAdvancedOperations;
 };
 
 #endif