X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMAlgo%2FGEOMAlgo_SolidSolid.hxx;h=fd8d344d79b09ec38413c8ba5c9193f6fe6f47b7;hb=11cbc17d51c4ea7226b75d501ea7d5ca2a1e1480;hp=fa1895c7be85a99b18a1e8eb6c55e81358586be7;hpb=9499b99fe2dcb53e1ea364f97986f8f432b04600;p=modules%2Fgeom.git

diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
index fa1895c7b..fd8d344d7 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
@@ -1,99 +1,65 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2020  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 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// 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
+//
 
+// File:        GEOMAlgo_SolidSolid.hxx
+// Created:     Wed Jan 26 12:06:26 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
 #ifndef _GEOMAlgo_SolidSolid_HeaderFile
 #define _GEOMAlgo_SolidSolid_HeaderFile
 
-#ifndef _TopoDS_Shape_HeaderFile
-#include <TopoDS_Shape.hxx>
-#endif
-#ifndef _GEOMAlgo_ShellSolid_HeaderFile
-#include <GEOMAlgo_ShellSolid.hxx>
-#endif
-class TopoDS_Shape;
-
-
-#ifndef _Standard_HeaderFile
 #include <Standard.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
-#endif
-
-class GEOMAlgo_SolidSolid  : public GEOMAlgo_ShellSolid {
+#include <TopoDS_Shape.hxx>
 
-public:
+#include <GEOMAlgo_ShellSolid.hxx>
 
-    void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOMAlgo_SolidSolid();
-Standard_EXPORT virtual ~GEOMAlgo_SolidSolid();
-Standard_EXPORT virtual  void Perform() ;
-Standard_EXPORT   void SetShape2(const TopoDS_Shape& aS) ;
-Standard_EXPORT  const TopoDS_Shape& Shape2() const;
+//=======================================================================
+//function : GEOMAlgo_SolidSolid
+//purpose  :
+//=======================================================================
+class GEOMAlgo_SolidSolid  : public GEOMAlgo_ShellSolid
+{
+ public:
+  Standard_EXPORT
+    GEOMAlgo_SolidSolid();
 
+  Standard_EXPORT
+    virtual ~GEOMAlgo_SolidSolid();
 
+  Standard_EXPORT
+    virtual void Perform() ;
 
+  Standard_EXPORT
+    void SetShape2(const TopoDS_Shape& aS) ;
 
+  Standard_EXPORT
+    const TopoDS_Shape& Shape2() const;
 
 protected:
+  Standard_EXPORT
+    virtual void BuildResult() ;
 
- // Methods PROTECTED
- // 
-Standard_EXPORT virtual  void BuildResult() ;
-
-
- // Fields PROTECTED
- //
-TopoDS_Shape myS2;
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
+  TopoDS_Shape myS2;
 };
-
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif