OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026780: Coding rules - eliminate warnings on Linux and Mac

Browse Source 
Avoid warnings by means of ifdef/ifndef or removing unused code.
This commit is contained in:
rkv 2015-11-06 14:22:16 +03:00 committed by abv
parent c9246067a1
commit d48df25df1
11 changed files with 84 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Draw/Draw_BasicCommands.cxx
View File

@ -411,13 +411,13 @@ static unsigned int __stdcall CpuFunc (void * /*param*/)
aCurrent = clock_t(anUserSeconds + aSystemSeconds); aCurrent = clock_t(anUserSeconds + aSystemSeconds);
anElapCurrent = clock_t(aTimer.ElapsedTime()); anElapCurrent = clock_t(aTimer.ElapsedTime());
if ((aCurrent - CPU_CURRENT) >= CPU_LIMIT) if (CPU_LIMIT > 0 && (aCurrent - CPU_CURRENT) >= CPU_LIMIT)
{ {
cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl; cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl;
aTimer.Stop(); aTimer.Stop();
ExitProcess (2); ExitProcess (2);
} }
if ((anElapCurrent) >= CPU_LIMIT) if (CPU_LIMIT > 0 && anElapCurrent >= CPU_LIMIT)
{ {
cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl; cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl;
aTimer.Stop(); aTimer.Stop();
@ -438,9 +438,7 @@ static void *CpuFunc(void* /*threadarg*/)
{ {
sleep (5); sleep (5);
anElapCurrent = clock_t(aTimer.ElapsedTime()); anElapCurrent = clock_t(aTimer.ElapsedTime());
if ( CPU_LIMIT < 0 ) if (CPU_LIMIT >0 && (anElapCurrent) >= CPU_LIMIT) {
return NULL;
if ((anElapCurrent) >= CPU_LIMIT) {
cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl; cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl;
exit(2); exit(2);
} }

17
src/OSD/OSD_DirectoryIterator.cxx
View File

@ -25,15 +25,22 @@
#include <dirent.h> #include <dirent.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
//const OSD_WhoAmI Iam = OSD_WDirectoryIterator;
OSD_DirectoryIterator::OSD_DirectoryIterator() {
myDescr = NULL ; OSD_DirectoryIterator::OSD_DirectoryIterator()
: myFlag(0),
myDescr(0),
myEntry(0),
myInit(0)
{
} }
OSD_DirectoryIterator::OSD_DirectoryIterator(const OSD_Path& where, OSD_DirectoryIterator::OSD_DirectoryIterator(const OSD_Path& where,
const TCollection_AsciiString& Mask){ const TCollection_AsciiString& Mask)
myDescr = NULL ; : myFlag(0),
myDescr(0),
myEntry(0),
myInit(0)
{
Initialize(where, Mask) ; Initialize(where, Mask) ;
} }

31
src/OSD/OSD_DirectoryIterator.hxx
View File

@ -84,38 +84,23 @@ public:
//! Returns error number if 'Failed' is TRUE. //! Returns error number if 'Failed' is TRUE.
Standard_EXPORT Standard_Integer Error() const; Standard_EXPORT Standard_Integer Error() const;
protected:
private: private:
OSD_Directory TheIterator; OSD_Directory TheIterator;
Standard_Integer myFlag; Standard_Integer myFlag;
TCollection_AsciiString myMask; TCollection_AsciiString myMask;
TCollection_AsciiString myPlace; TCollection_AsciiString myPlace;
Standard_Address myDescr;
Standard_Address myEntry;
Standard_Integer myInit;
OSD_Error myError; OSD_Error myError;
// platform-specific fields
#ifdef _WIN32
Standard_Address myHandle; Standard_Address myHandle;
Standard_Address myData; Standard_Address myData;
Standard_Boolean myFirstCall; Standard_Boolean myFirstCall;
#else
Standard_Address myDescr;
Standard_Address myEntry;
Standard_Integer myInit;
#endif
}; };
#endif // _OSD_DirectoryIterator_HeaderFile #endif // _OSD_DirectoryIterator_HeaderFile

16
src/OSD/OSD_FileIterator.cxx
View File

@ -50,13 +50,21 @@ extern char *vmsify PARAMS ((char *name, int type));
//const OSD_WhoAmI Iam = OSD_WFileIterator; //const OSD_WhoAmI Iam = OSD_WFileIterator;
OSD_FileIterator::OSD_FileIterator() { OSD_FileIterator::OSD_FileIterator()
myDescr = NULL ; : myFlag(0),
myDescr(0),
myEntry(0),
myInit(0)
{
} }
OSD_FileIterator::OSD_FileIterator(const OSD_Path& where, OSD_FileIterator::OSD_FileIterator(const OSD_Path& where,
const TCollection_AsciiString& Mask){ const TCollection_AsciiString& Mask)
myDescr = NULL ; : myFlag(0),
myDescr(0),
myEntry(0),
myInit(0)
{
Initialize(where, Mask) ; Initialize(where, Mask) ;
} }

45
src/OSD/OSD_FileIterator.hxx
View File

@ -17,24 +17,15 @@
#ifndef _OSD_FileIterator_HeaderFile #ifndef _OSD_FileIterator_HeaderFile
#define _OSD_FileIterator_HeaderFile #define _OSD_FileIterator_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#include <Standard_Integer.hxx>
#include <TCollection_AsciiString.hxx>
#include <Standard_Address.hxx>
#include <OSD_Error.hxx> #include <OSD_Error.hxx>
#include <Standard_Boolean.hxx> #include <TCollection_AsciiString.hxx>
class OSD_OSDError; class OSD_OSDError;
class OSD_Path; class OSD_Path;
class TCollection_AsciiString;
class OSD_File; class OSD_File;
//! Manages a breadth-only search for files in the specified Path.
//! Manages a breadth-only search for files in the specified
//! Path.
//! There is no specific order of results. //! There is no specific order of results.
class OSD_FileIterator class OSD_FileIterator
{ {
@ -84,38 +75,24 @@ public:
//! Returns error number if 'Failed' is TRUE. //! Returns error number if 'Failed' is TRUE.
Standard_EXPORT Standard_Integer Error() const; Standard_EXPORT Standard_Integer Error() const;
protected:
private: private:
OSD_File TheIterator; OSD_File TheIterator;
Standard_Integer myFlag; Standard_Integer myFlag;
TCollection_AsciiString myMask; TCollection_AsciiString myMask;
TCollection_AsciiString myPlace; TCollection_AsciiString myPlace;
Standard_Address myDescr;
Standard_Address myEntry;
Standard_Integer myInit;
OSD_Error myError; OSD_Error myError;
// platform-specific fields
#ifdef _WIN32
Standard_Address myHandle; Standard_Address myHandle;
Standard_Address myData; Standard_Address myData;
Standard_Boolean myFirstCall; Standard_Boolean myFirstCall;
#else
Standard_Address myDescr;
Standard_Address myEntry;
Standard_Integer myInit;
#endif
}; };
#endif // _OSD_FileIterator_HeaderFile #endif // _OSD_FileIterator_HeaderFile

5
src/OpenGl/OpenGl_Workspace.cxx
View File

@ -54,11 +54,6 @@ namespace
static const OpenGl_AspectFace myDefaultAspectFace; static const OpenGl_AspectFace myDefaultAspectFace;
static const OpenGl_AspectMarker myDefaultAspectMarker; static const OpenGl_AspectMarker myDefaultAspectMarker;
static const OpenGl_TextParam myDefaultTextParam =
{
16, Graphic3d_HTA_LEFT, Graphic3d_VTA_BOTTOM
};
static const OpenGl_Matrix myDefaultMatrix = static const OpenGl_Matrix myDefaultMatrix =
{ {
{{ 1.0F, 0.0F, 0.0F, 0.0F }, {{ 1.0F, 0.0F, 0.0F, 0.0F },

6
src/Select3D/Select3D_SensitiveTriangulation.cxx
View File

@ -51,8 +51,7 @@ Select3D_SensitiveTriangulation::Select3D_SensitiveTriangulation (const Handle(S
const Standard_Boolean theIsInterior) const Standard_Boolean theIsInterior)
: Select3D_SensitiveSet (theOwnerId), : Select3D_SensitiveSet (theOwnerId),
myTriangul (theTrg), myTriangul (theTrg),
myInitLocation (theInitLoc), myInitLocation (theInitLoc)
myDetectedTr (-1)
{ {
myInvInitLocation = myInitLocation.Transformation().Inverted(); myInvInitLocation = myInitLocation.Transformation().Inverted();
mySensType = theIsInterior ? Select3D_TOS_INTERIOR : Select3D_TOS_BOUNDARY; mySensType = theIsInterior ? Select3D_TOS_INTERIOR : Select3D_TOS_BOUNDARY;
@ -144,8 +143,7 @@ Select3D_SensitiveTriangulation::Select3D_SensitiveTriangulation (const Handle(S
myTriangul (theTrg), myTriangul (theTrg),
myInitLocation (theInitLoc), myInitLocation (theInitLoc),
myCDG3D (theCOG), myCDG3D (theCOG),
myFreeEdges (theFreeEdges), myFreeEdges (theFreeEdges)
myDetectedTr (-1)
{ {
myInvInitLocation = myInitLocation.Transformation().Inverted(); myInvInitLocation = myInitLocation.Transformation().Inverted();
mySensType = theIsInterior ? Select3D_TOS_INTERIOR : Select3D_TOS_BOUNDARY; mySensType = theIsInterior ? Select3D_TOS_INTERIOR : Select3D_TOS_BOUNDARY;

1
src/Select3D/Select3D_SensitiveTriangulation.hxx
View File

@ -141,7 +141,6 @@ private:
gp_Pnt myCDG3D; //!< Center of the whole triangulation gp_Pnt myCDG3D; //!< Center of the whole triangulation
Handle(TColStd_HArray1OfInteger) myFreeEdges; Handle(TColStd_HArray1OfInteger) myFreeEdges;
Standard_Boolean mySensType; //!< Type of sensitivity: boundary or interior Standard_Boolean mySensType; //!< Type of sensitivity: boundary or interior
Standard_Integer myDetectedTr;
Standard_Integer myPrimitivesNb; //!< Amount of free edges or triangles depending on sensitivity type Standard_Integer myPrimitivesNb; //!< Amount of free edges or triangles depending on sensitivity type
Handle(TColStd_HArray1OfInteger) myBVHPrimIndexes; //!< Indexes of edges or triangles for BVH build Handle(TColStd_HArray1OfInteger) myBVHPrimIndexes; //!< Indexes of edges or triangles for BVH build
mutable Select3D_BndBox3d myBndBox; //!< Bounding box of the whole triangulation mutable Select3D_BndBox3d myBndBox; //!< Bounding box of the whole triangulation

1
src/TopOpeBRepTool/FILES
View File

@ -75,7 +75,6 @@ TopOpeBRepTool_SC.cxx
TopOpeBRepTool_SC.hxx TopOpeBRepTool_SC.hxx
TopOpeBRepTool_ShapeClassifier.cxx TopOpeBRepTool_ShapeClassifier.cxx
TopOpeBRepTool_ShapeClassifier.hxx TopOpeBRepTool_ShapeClassifier.hxx
TopOpeBRepTool_ShapeExplorer.cxx
TopOpeBRepTool_ShapeExplorer.hxx TopOpeBRepTool_ShapeExplorer.hxx
TopOpeBRepTool_ShapeTool.cxx TopOpeBRepTool_ShapeTool.cxx
TopOpeBRepTool_ShapeTool.hxx TopOpeBRepTool_ShapeTool.hxx

153
src/TopOpeBRepTool/TopOpeBRepTool_ShapeExplorer.cxx
View File

@ -1,153 +0,0 @@
// Created on: 1995-07-13
// Created by: Jean Yves LEBEY
// Copyright (c) 1995-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.
#include <Standard_NoMoreObject.hxx>
#include <Standard_NoSuchObject.hxx>
#include <TopAbs.hxx>
#include <TopoDS_Shape.hxx>
#include <TopOpeBRepTool_ShapeExplorer.hxx>
//=======================================================================
//function : TopOpeBRepTool_ShapeExplorer
//purpose :
//=======================================================================
TopOpeBRepTool_ShapeExplorer::TopOpeBRepTool_ShapeExplorer() :
myIndex(0),
myNbShapes(0)
{
}
//=======================================================================
//function : TopOpeBRepTool_ShapeExplorer
//purpose :
//=======================================================================
TopOpeBRepTool_ShapeExplorer::TopOpeBRepTool_ShapeExplorer
(const TopoDS_Shape& S,
const TopAbs_ShapeEnum ToFind,
const TopAbs_ShapeEnum ToAvoid)
{
Init(S,ToFind,ToAvoid);
}
//=======================================================================
//function : Init
//purpose :
//=======================================================================
void TopOpeBRepTool_ShapeExplorer::Init(const TopoDS_Shape& S,
const TopAbs_ShapeEnum ToFind,
const TopAbs_ShapeEnum ToAvoid)
{
myExplorer.Init(S,ToFind,ToAvoid);
#ifdef OCCT_DEBUG
myIndex = myNbShapes = 0;
for (;More();Next()) myNbShapes++;
myExplorer.ReInit();
if (More()) myIndex = 1;
#endif
}
//=======================================================================
//function : More
//purpose :
//=======================================================================
Standard_Boolean TopOpeBRepTool_ShapeExplorer::More()const
{
Standard_Boolean b = myExplorer.More();
return b;
}
//=======================================================================
//function : Next
//purpose :
//=======================================================================
void TopOpeBRepTool_ShapeExplorer::Next()
{
myExplorer.Next();
#ifdef OCCT_DEBUG
myIndex++;
#endif
}
//=======================================================================
//function : Current
//purpose :
//=======================================================================
const TopoDS_Shape& TopOpeBRepTool_ShapeExplorer::Current()const
{
const TopoDS_Shape& S = myExplorer.Current();
return S;
}
//=======================================================================
//function : NbShapes
//purpose :
//=======================================================================
Standard_Integer TopOpeBRepTool_ShapeExplorer::NbShapes()const
{
Standard_Integer n = 0;
#ifdef OCCT_DEBUG
n = myNbShapes;
#endif
return n;
}
//=======================================================================
//function : Index
//purpose :
//=======================================================================
Standard_Integer TopOpeBRepTool_ShapeExplorer::Index()const
{
Standard_Integer n = 0;
#ifdef OCCT_DEBUG
n = myIndex;
#endif
return n;
}
//=======================================================================
//function : DumpCurrent
//purpose :
//=======================================================================
Standard_OStream& TopOpeBRepTool_ShapeExplorer::DumpCurrent
(Standard_OStream& OS)const
{
#ifdef OCCT_DEBUG
if ( More() ) {
const TopoDS_Shape& S = Current();
TopAbs_ShapeEnum T = S.ShapeType();
TopAbs_Orientation O = S.Orientation();
Standard_Integer I = Index();
TopAbs::Print(T,cout);
cout<<"("<<I<<","; TopAbs::Print(O,cout); cout<<") ";
}
#endif
return OS;
}

87
src/TopOpeBRepTool/TopOpeBRepTool_ShapeExplorer.hxx
View File

@ -17,28 +17,20 @@
#ifndef _TopOpeBRepTool_ShapeExplorer_HeaderFile #ifndef _TopOpeBRepTool_ShapeExplorer_HeaderFile
#define _TopOpeBRepTool_ShapeExplorer_HeaderFile #define _TopOpeBRepTool_ShapeExplorer_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <Standard_Integer.hxx> #include <TopAbs.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_OStream.hxx>
class TopoDS_Shape;
//! Extends TopExp_Explorer by counting index of current item
//! (for tracing and debug)
class TopOpeBRepTool_ShapeExplorer : public TopExp_Explorer
class TopOpeBRepTool_ShapeExplorer
{ {
public: public:
DEFINE_STANDARD_ALLOC
//! Creates an empty explorer, becomes usefull after Init. //! Creates an empty explorer, becomes usefull after Init.
Standard_EXPORT TopOpeBRepTool_ShapeExplorer(); TopOpeBRepTool_ShapeExplorer() : myIndex(0)
{
}
//! Creates an Explorer on the Shape <S>. //! Creates an Explorer on the Shape <S>.
//! //!
@ -49,50 +41,43 @@ public:
//! exploration. If <ToAvoid> is equal or less //! exploration. If <ToAvoid> is equal or less
//! complex than <ToFind> or if <ToAVoid> is SHAPE it //! complex than <ToFind> or if <ToAVoid> is SHAPE it
//! has no effect on the exploration. //! has no effect on the exploration.
Standard_EXPORT TopOpeBRepTool_ShapeExplorer(const TopoDS_Shape& S, const TopAbs_ShapeEnum ToFind, const TopAbs_ShapeEnum ToAvoid = TopAbs_SHAPE); TopOpeBRepTool_ShapeExplorer(const TopoDS_Shape& S, const TopAbs_ShapeEnum ToFind, const TopAbs_ShapeEnum ToAvoid = TopAbs_SHAPE)
: TopExp_Explorer (S, ToFind, ToAvoid), myIndex(More() ? 1 : 0)
{
}
Standard_EXPORT void Init (const TopoDS_Shape& S, const TopAbs_ShapeEnum ToFind, const TopAbs_ShapeEnum ToAvoid = TopAbs_SHAPE); void Init (const TopoDS_Shape& S, const TopAbs_ShapeEnum ToFind, const TopAbs_ShapeEnum ToAvoid = TopAbs_SHAPE)
{
//! Returns True if there are more shapes in the TopExp_Explorer::Init(S,ToFind,ToAvoid);
//! exploration. myIndex = (More() ? 1 : 0);
Standard_EXPORT Standard_Boolean More() const; }
//! Moves to the next Shape in the exploration. //! Moves to the next Shape in the exploration.
Standard_EXPORT void Next(); void Next()
{
//! Returns the current shape in the exploration. if (More())
Standard_EXPORT const TopoDS_Shape& Current() const; myIndex++;
TopExp_Explorer::Next();
Standard_EXPORT Standard_Integer NbShapes() const; }
Standard_EXPORT Standard_Integer Index() const;
Standard_EXPORT Standard_OStream& DumpCurrent (Standard_OStream& OS) const;
protected:
//! Index of current sub-shape
Standard_Integer Index() const { return myIndex; }
//! Dump info on current shape to stream
Standard_OStream& DumpCurrent (Standard_OStream& OS) const
{
if (More())
{
TopAbs::Print (Current().ShapeType(), OS);
OS << "(" << Index() << ",";
TopAbs::Print (Current().Orientation(), OS);
OS << ") ";
}
return OS;
}
private: private:
TopExp_Explorer myExplorer;
Standard_Integer myIndex; Standard_Integer myIndex;
Standard_Integer myNbShapes;
}; };
#endif // _TopOpeBRepTool_ShapeExplorer_HeaderFile #endif // _TopOpeBRepTool_ShapeExplorer_HeaderFile