0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / BRepBuilderAPI / BRepBuilderAPI_Collect.cxx

diff --git a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 4500f92..f24c38b
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
@@ -1,37 +1,32 @@
 // Created on: 1996-04-09
 // Created by: Yves FRICAUD
 // Copyright (c) 1996-1999 Matra Datavision
-// Copyright (c) 1999-2012 OPEN CASCADE SAS
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
 //
-// The content of this file is subject to the Open CASCADE Technology Public
-// License Version 6.5 (the "License"). You may not use the content of this file
-// except in compliance with the License. Please obtain a copy of the License
-// at http://www.opencascade.org and read it completely before using this file.
+// This file is part of Open CASCADE Technology software library.
 //
-// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+// This library is free software; you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
 //
-// The Original Code and all software distributed under the License is
-// distributed on an "AS IS" basis, without warranty of any kind, and the
-// Initial Developer hereby disclaims all such warranties, including without
-// limitation, any warranties of merchantability, fitness for a particular
-// purpose or non-infringement. Please see the License for the specific terms
-// and conditions governing the rights and limitations under the License.
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
 
 
-
-#include <BRepBuilderAPI_Collect.ixx>
-
-#include <TopoDS.hxx>
+#include <BRepBuilderAPI_Collect.hxx>
+#include <BRepBuilderAPI_MakeShape.hxx>
 #include <TopExp_Explorer.hxx>
-
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_ListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#ifdef DEB
+#ifdef OCCT_DEBUG
 #include <stdio.h>
 Standard_Boolean Affich;
 #endif
@@ -165,7 +160,7 @@ static void Update (   TopTools_DataMapOfShapeListOfShape& Mod,
     }
   }
 }
-#ifdef DEB
+#ifdef OCCT_DEBUG
 //=======================================================================
 //function : DEBControl
 //purpose  : 
@@ -186,7 +181,6 @@ static void DEBControl (const TopTools_DataMapOfShapeListOfShape& MG)
     TopTools_ListIteratorOfListOfShape itl(MG(OS));
     Standard_Integer IV = 1;
     for (; itl.More(); itl.Next()) {
-      const TopoDS_Shape& NS = itl.Value();
       sprintf(name, "SV_%d_%d",IK,IV++);
 #ifdef DRAW
       DBRep::Set(name,NS);
@@ -221,7 +215,7 @@ void BRepBuilderAPI_Collect::Add (const TopoDS_Shape& SI,
   Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_EDGE);
   Update (myMod,myGen,ModBack,GenBack,SI,MKS,TopAbs_VERTEX);
 
-#ifdef DEB
+#ifdef OCCT_DEBUG
   if (Affich) {
     DEBControl (myGen);
     DEBControl (myMod);
@@ -330,7 +324,7 @@ static void FilterByShape(TopTools_DataMapOfShapeListOfShape& MG,
       else if (itl.More()) itl.Next();
     }
   }
-#ifdef DEB
+#ifdef OCCT_DEBUG
   if (Affich) {
     DEBControl (MG);
   }