From 9b0fb8cdd0d57f60856cb3f6d2bece8b23209f92 Mon Sep 17 00:00:00 2001 From: ski Date: Thu, 5 Jun 2014 14:18:09 +0400 Subject: [PATCH] 0024972: Problem of the influence of the includes order during compilation All necessary files were included. Unused files from package PColStd were removed. --- src/BOPDS/BOPDS_Curve.lxx | 2 + src/BOPDS/BOPDS_ListOfPaveBlock.hxx | 3 +- src/BRepOffset/BRepOffset_Inter2d.cxx | 1 + src/BRepOffset/BRepOffset_Tool.cxx | 1 + src/GeomInt/GeomInt_LineConstructor.lxx | 2 + .../IntPatch_ImpImpIntersection_0.gxx | 7 ++ src/IntTools/IntTools_LineConstructor.lxx | 2 + src/PColStd/PColStd_HashAsciiString.cdl | 43 ------------ src/PColStd/PColStd_HashAsciiString.cxx | 66 ------------------- src/PColStd/PColStd_HashExtendedString.cdl | 43 ------------ src/PColStd/PColStd_HashExtendedString.cxx | 66 ------------------- src/PLib/PLib_HermitJacobi.lxx | 2 + src/TNaming/TNaming_IteratorOnShapesSet.lxx | 2 + 13 files changed, 20 insertions(+), 220 deletions(-) delete mode 100644 src/PColStd/PColStd_HashAsciiString.cdl delete mode 100644 src/PColStd/PColStd_HashAsciiString.cxx delete mode 100644 src/PColStd/PColStd_HashExtendedString.cdl delete mode 100644 src/PColStd/PColStd_HashExtendedString.cxx diff --git a/src/BOPDS/BOPDS_Curve.lxx b/src/BOPDS/BOPDS_Curve.lxx index 2550867e9c..195f295440 100644 --- a/src/BOPDS/BOPDS_Curve.lxx +++ b/src/BOPDS/BOPDS_Curve.lxx @@ -12,6 +12,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + //======================================================================= //function : //purpose : diff --git a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx index 88f21a0661..1b1f3fae85 100644 --- a/src/BOPDS/BOPDS_ListOfPaveBlock.hxx +++ b/src/BOPDS/BOPDS_ListOfPaveBlock.hxx @@ -16,8 +16,7 @@ #define BOPDS_ListOfPaveBlock_HeaderFile #include -#include -class BOPDS_PaveBlock; +class Handle_BOPDS_PaveBlock; typedef NCollection_List BOPDS_ListOfPaveBlock; typedef BOPDS_ListOfPaveBlock::Iterator BOPDS_ListIteratorOfListOfPaveBlock; diff --git a/src/BRepOffset/BRepOffset_Inter2d.cxx b/src/BRepOffset/BRepOffset_Inter2d.cxx index e6594d2523..6f96ef5305 100644 --- a/src/BRepOffset/BRepOffset_Inter2d.cxx +++ b/src/BRepOffset/BRepOffset_Inter2d.cxx @@ -47,6 +47,7 @@ #include #include +#include #include #include #include diff --git a/src/BRepOffset/BRepOffset_Tool.cxx b/src/BRepOffset/BRepOffset_Tool.cxx index 95cac099d3..691f6619ad 100644 --- a/src/BRepOffset/BRepOffset_Tool.cxx +++ b/src/BRepOffset/BRepOffset_Tool.cxx @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include diff --git a/src/GeomInt/GeomInt_LineConstructor.lxx b/src/GeomInt/GeomInt_LineConstructor.lxx index 5e22d9daa3..b00f11a966 100644 --- a/src/GeomInt/GeomInt_LineConstructor.lxx +++ b/src/GeomInt/GeomInt_LineConstructor.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + //======================================================================= //function : GeomInt_LineConstructor //purpose : diff --git a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx index 44d73eb8ec..898fde5bcc 100644 --- a/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx +++ b/src/IntPatch/IntPatch_ImpImpIntersection_0.gxx @@ -16,6 +16,13 @@ // Modified by skv - Thu Jan 15 15:57:15 2004 OCC4455 +#include +#include +#include +#include +#include +#include + static void PutPointsOnLine(const Handle(Adaptor3d_HSurface)& S1, const Handle(Adaptor3d_HSurface)& S2, const IntPatch_SequenceOfPathPointOfTheSOnBounds&, diff --git a/src/IntTools/IntTools_LineConstructor.lxx b/src/IntTools/IntTools_LineConstructor.lxx index 53066cc4e6..4a57511b5f 100644 --- a/src/IntTools/IntTools_LineConstructor.lxx +++ b/src/IntTools/IntTools_LineConstructor.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + //======================================================================= //function : GeomInt_LineConstructor //purpose : diff --git a/src/PColStd/PColStd_HashAsciiString.cdl b/src/PColStd/PColStd_HashAsciiString.cdl deleted file mode 100644 index 1cbb29700f..0000000000 --- a/src/PColStd/PColStd_HashAsciiString.cdl +++ /dev/null @@ -1,43 +0,0 @@ --- Copyright (c) 1992-1999 Matra Datavision --- Copyright (c) 1999-2014 OPEN CASCADE SAS --- --- This file is part of Open CASCADE Technology software library. --- --- 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. --- --- Alternatively, this file may be used under the terms of Open CASCADE --- commercial license or contractual agreement. - ----Version: - --- Version Date Purpose --- 01/04/93 Creation - -class HashAsciiString from PColStd - ----Purpose: Redefines the HashCode for HAsciiString - -inherits HOfAsciiString from PColStd - -uses - - HAsciiString from PCollection - -is - - Create returns HashAsciiString; - ---Purpose : Empty constructor. - - HashCode (me; MyKey : HAsciiString ; Upper : Integer) - returns Integer is redefined; - ---Purpose : Returns a hashcod value of key bounded by Upper. - - Compare (me; One , Two : HAsciiString) returns Boolean is redefined; - ---Purpose : Compare two keys and returns a boolean value - -end HashAsciiString; - diff --git a/src/PColStd/PColStd_HashAsciiString.cxx b/src/PColStd/PColStd_HashAsciiString.cxx deleted file mode 100644 index ead71d40b5..0000000000 --- a/src/PColStd/PColStd_HashAsciiString.cxx +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 1992-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// 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. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//-Version: - -// Version Date Purpose -// 01/04/93 Creation - -//-Language C++ - -//-Declarations -#include -#include -#include -#include - -//======================================================================= -// Function : Create -//======================================================================= - -PColStd_HashAsciiString::PColStd_HashAsciiString() -{} - -//======================================================================= -// Function : HashCode -//======================================================================= - -Standard_Integer PColStd_HashAsciiString::HashCode - (const Handle(PCollection_HAsciiString) &MyKey, - const Standard_Integer Upper) const -{ - Standard_Integer total=0; - - if ( Upper < 1 ){ - Standard_RangeError:: - Raise("Try to apply HasCode method with negative or null argument."); - } - for (Standard_Integer I = 1 ; I <= MyKey->Length() ; I++ ) { - total = total + (Standard_Integer) (MyKey->Value(I)); - } - total = ::HashCode( total , Upper ) ; - - return total; -} - -//======================================================================= -// Function : Compare -//======================================================================= - -Standard_Boolean PColStd_HashAsciiString::Compare - (const Handle(PCollection_HAsciiString) &One, - const Handle(PCollection_HAsciiString) &Two) const -{ - return (One->IsSameString(Two)); -} diff --git a/src/PColStd/PColStd_HashExtendedString.cdl b/src/PColStd/PColStd_HashExtendedString.cdl deleted file mode 100644 index 34094596a7..0000000000 --- a/src/PColStd/PColStd_HashExtendedString.cdl +++ /dev/null @@ -1,43 +0,0 @@ --- Copyright (c) 1992-1999 Matra Datavision --- Copyright (c) 1999-2014 OPEN CASCADE SAS --- --- This file is part of Open CASCADE Technology software library. --- --- 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. --- --- Alternatively, this file may be used under the terms of Open CASCADE --- commercial license or contractual agreement. - ----Version: - --- Version Date Purpose --- 01/04/93 Creation - -class HashExtendedString from PColStd - ----Purpose: Redefines the HashCode for HExtendedString - -inherits HOfExtendedString from PColStd - -uses - - HExtendedString from PCollection - -is - - Create returns HashExtendedString; - ---Purpose : Empty constructor. - - HashCode (me; MyKey : HExtendedString ; Upper : Integer) - returns Integer is redefined; - ---Purpose : Returns a hashcod value of key bounded by Upper. - - Compare (me; One , Two : HExtendedString) returns Boolean is redefined; - ---Purpose : Compare two keys and returns a boolean value - -end HashExtendedString; - diff --git a/src/PColStd/PColStd_HashExtendedString.cxx b/src/PColStd/PColStd_HashExtendedString.cxx deleted file mode 100644 index 75a2ace983..0000000000 --- a/src/PColStd/PColStd_HashExtendedString.cxx +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 1992-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// 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. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//-Version: - -// Version Date Purpose -// 01/04/93 Creation - -//-Language C++ - -//-Declarations -#include -#include -#include -#include - -//======================================================================= -// Function : Create -//======================================================================= - -PColStd_HashExtendedString::PColStd_HashExtendedString() -{} - -//======================================================================= -// Function : HashCode -//======================================================================= - -Standard_Integer PColStd_HashExtendedString::HashCode - (const Handle(PCollection_HExtendedString) &MyKey, - const Standard_Integer Upper) const -{ - Standard_Integer total=0; - - if ( Upper < 1 ){ - Standard_RangeError:: - Raise("Try to apply HasCode method with negative or null argument."); - } - for (Standard_Integer I = 1 ; I <= MyKey->Length() ; I++ ) { - total = total + (Standard_Integer) (MyKey->Value(I)); - } - total = ::HashCode( total , Upper ) ; - - return total; -} - -//======================================================================= -// Function : Compare -//======================================================================= - -Standard_Boolean PColStd_HashExtendedString::Compare - (const Handle(PCollection_HExtendedString) &One, - const Handle(PCollection_HExtendedString) &Two) const -{ - return (One->IsSameString(Two)); -} diff --git a/src/PLib/PLib_HermitJacobi.lxx b/src/PLib/PLib_HermitJacobi.lxx index a1decf1ccf..9df7aeca54 100644 --- a/src/PLib/PLib_HermitJacobi.lxx +++ b/src/PLib/PLib_HermitJacobi.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + inline Standard_Integer PLib_HermitJacobi::WorkDegree() const { return myJacobi->WorkDegree(); diff --git a/src/TNaming/TNaming_IteratorOnShapesSet.lxx b/src/TNaming/TNaming_IteratorOnShapesSet.lxx index b38ab8f0ba..faa54edcbe 100644 --- a/src/TNaming/TNaming_IteratorOnShapesSet.lxx +++ b/src/TNaming/TNaming_IteratorOnShapesSet.lxx @@ -14,6 +14,8 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include + //======================================================================= //function : //purpose :