mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +03:00
0026780: Coding rules - eliminate warnings on Linux and Mac
Avoid warnings by means of ifdef/ifndef or removing unused code.
This commit is contained in:
@@ -25,15 +25,22 @@
|
||||
#include <dirent.h>
|
||||
#include <stdio.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,
|
||||
const TCollection_AsciiString& Mask){
|
||||
myDescr = NULL ;
|
||||
const TCollection_AsciiString& Mask)
|
||||
: myFlag(0),
|
||||
myDescr(0),
|
||||
myEntry(0),
|
||||
myInit(0)
|
||||
{
|
||||
Initialize(where, Mask) ;
|
||||
}
|
||||
|
||||
|
@@ -84,38 +84,23 @@ public:
|
||||
//! Returns error number if 'Failed' is TRUE.
|
||||
Standard_EXPORT Standard_Integer Error() const;
|
||||
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
|
||||
OSD_Directory TheIterator;
|
||||
Standard_Integer myFlag;
|
||||
TCollection_AsciiString myMask;
|
||||
TCollection_AsciiString myPlace;
|
||||
Standard_Address myDescr;
|
||||
Standard_Address myEntry;
|
||||
Standard_Integer myInit;
|
||||
OSD_Error myError;
|
||||
|
||||
// platform-specific fields
|
||||
#ifdef _WIN32
|
||||
Standard_Address myHandle;
|
||||
Standard_Address myData;
|
||||
Standard_Boolean myFirstCall;
|
||||
|
||||
|
||||
#else
|
||||
Standard_Address myDescr;
|
||||
Standard_Address myEntry;
|
||||
Standard_Integer myInit;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _OSD_DirectoryIterator_HeaderFile
|
||||
|
@@ -50,13 +50,21 @@ extern char *vmsify PARAMS ((char *name, int type));
|
||||
//const OSD_WhoAmI Iam = OSD_WFileIterator;
|
||||
|
||||
|
||||
OSD_FileIterator::OSD_FileIterator() {
|
||||
myDescr = NULL ;
|
||||
OSD_FileIterator::OSD_FileIterator()
|
||||
: myFlag(0),
|
||||
myDescr(0),
|
||||
myEntry(0),
|
||||
myInit(0)
|
||||
{
|
||||
}
|
||||
|
||||
OSD_FileIterator::OSD_FileIterator(const OSD_Path& where,
|
||||
const TCollection_AsciiString& Mask){
|
||||
myDescr = NULL ;
|
||||
const TCollection_AsciiString& Mask)
|
||||
: myFlag(0),
|
||||
myDescr(0),
|
||||
myEntry(0),
|
||||
myInit(0)
|
||||
{
|
||||
Initialize(where, Mask) ;
|
||||
}
|
||||
|
||||
|
@@ -17,24 +17,15 @@
|
||||
#ifndef _OSD_FileIterator_HeaderFile
|
||||
#define _OSD_FileIterator_HeaderFile
|
||||
|
||||
#include <Standard.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Handle.hxx>
|
||||
|
||||
#include <OSD_File.hxx>
|
||||
#include <Standard_Integer.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
#include <Standard_Address.hxx>
|
||||
#include <OSD_Error.hxx>
|
||||
#include <Standard_Boolean.hxx>
|
||||
#include <TCollection_AsciiString.hxx>
|
||||
|
||||
class OSD_OSDError;
|
||||
class OSD_Path;
|
||||
class TCollection_AsciiString;
|
||||
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.
|
||||
class OSD_FileIterator
|
||||
{
|
||||
@@ -84,38 +75,24 @@ public:
|
||||
//! Returns error number if 'Failed' is TRUE.
|
||||
Standard_EXPORT Standard_Integer Error() const;
|
||||
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
|
||||
OSD_File TheIterator;
|
||||
Standard_Integer myFlag;
|
||||
TCollection_AsciiString myMask;
|
||||
TCollection_AsciiString myPlace;
|
||||
Standard_Address myDescr;
|
||||
Standard_Address myEntry;
|
||||
Standard_Integer myInit;
|
||||
OSD_Error myError;
|
||||
|
||||
// platform-specific fields
|
||||
#ifdef _WIN32
|
||||
Standard_Address myHandle;
|
||||
Standard_Address myData;
|
||||
Standard_Boolean myFirstCall;
|
||||
|
||||
|
||||
#else
|
||||
Standard_Address myDescr;
|
||||
Standard_Address myEntry;
|
||||
Standard_Integer myInit;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#endif // _OSD_FileIterator_HeaderFile
|
||||
|
Reference in New Issue
Block a user