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

Fix of compiler warnings on OCCT 7.0.0.beta (CLang and VC++ 14)

Browse Source
This commit is contained in:
abv 2015-12-27 14:48:22 +03:00
parent 13c7b7a395
commit 8bb8064e8f
5 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
View File

@ -460,9 +460,9 @@ void BOPAlgo_PaveFiller::PerformEE()
if (bLineLine) { if (bLineLine) {
// increase tolerance for Line/Line intersection, but do not update // increase tolerance for Line/Line intersection, but do not update
// the vertex till its intersection with some other shape // the vertex till its intersection with some other shape
Standard_Real aTol = (aCR1.Last() - aCR1.First()) / 2.; Standard_Real aTolMin = (aCR1.Last() - aCR1.First()) / 2.;
if (aTol > aTolVnew) { if (aTolMin > aTolVnew) {
aTolVnew = aTol; aTolVnew = aTolMin;
} }
} }
// <-LXBR // <-LXBR

15
src/BOPAlgo/BOPAlgo_PaveFiller_5.cxx
View File

@ -454,7 +454,6 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
// //
Standard_Integer nVx, nVSD, iV, iErr, nE, iFlag, iX, i, aNbPBLI; Standard_Integer nVx, nVSD, iV, iErr, nE, iFlag, iX, i, aNbPBLI;
Standard_Real aT, dummy; Standard_Real aT, dummy;
TopoDS_Shape aV;
BOPCol_ListIteratorOfListOfShape aItLS; BOPCol_ListIteratorOfListOfShape aItLS;
BOPCol_ListIteratorOfListOfInteger aItLI; BOPCol_ListIteratorOfListOfInteger aItLI;
BOPDS_PDS aPDS; BOPDS_PDS aPDS;
@ -504,12 +503,7 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
const TopoDS_Shape& aVx = aItLS.Value(); const TopoDS_Shape& aVx = aItLS.Value();
nVx = aPDS->Index(aVx); nVx = aPDS->Index(aVx);
// //
if (aPDS->HasShapeSD(nVx, nVSD)) { const TopoDS_Shape& aV = (aPDS->HasShapeSD(nVx, nVSD) ? aPDS->Shape(nVSD) : aVx);
aV = aPDS->Shape(nVSD);
}
else {
aV = aVx;
}
BOPCol_ListOfShape* pLst = aImages.ChangeSeek(aV); BOPCol_ListOfShape* pLst = aImages.ChangeSeek(aV);
if (!pLst) { if (!pLst) {
pLst = &aImages.ChangeFromIndex(aImages.Add(aV, BOPCol_ListOfShape())); pLst = &aImages.ChangeFromIndex(aImages.Add(aV, BOPCol_ListOfShape()));
@ -554,12 +548,7 @@ Standard_Integer BOPAlgo_PaveFiller::PerformVerticesEF
const TopoDS_Shape& aVx=aItLS.Value(); const TopoDS_Shape& aVx=aItLS.Value();
nVx=aPDS->Index(aVx); nVx=aPDS->Index(aVx);
// //
if (aPDS->HasShapeSD(nVx, nVSD)) { const TopoDS_Shape& aV = (aPDS->HasShapeSD(nVx, nVSD) ? aPDS->Shape(nVSD) : aVx);
aV=aPDS->Shape(nVSD);
}
else {
aV=aVx;
}
iV = aMVI.Find(aV); iV = aMVI.Find(aV);
// //
BOPDS_CoupleOfPaveBlocks &aCPB=theMVCPB.ChangeFromKey(aVx); BOPDS_CoupleOfPaveBlocks &aCPB=theMVCPB.ChangeFromKey(aVx);

4
src/Standard/Standard_Type.hxx
View File

@ -184,8 +184,12 @@ namespace opencascade {
template <typename T> template <typename T>
const Handle(Standard_Type)& type_instance<T>::get () const Handle(Standard_Type)& type_instance<T>::get ()
{ {
#if (defined(_MSC_VER) && _MSC_VER < 1800) || \
(defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) && \
! defined(__clang__) && ! defined(__INTEL_COMPILER))
// ensure that myInstance is instantiated // ensure that myInstance is instantiated
(void)myInstance; (void)myInstance;
#endif
// static variable inside function ensures that descriptors // static variable inside function ensures that descriptors
// are initialized in correct sequence // are initialized in correct sequence

2
src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx
View File

@ -21,7 +21,7 @@ class StdDrivers_DocumentRetrievalDriver : public StdLDrivers_DocumentRetrievalD
{ {
public: public:
//! Register types. //! Register types.
Standard_EXPORT virtual void BindTypes (StdObjMgt_MapOfInstantiators& theMap); Standard_EXPORT virtual void BindTypes (StdObjMgt_MapOfInstantiators& theMap) Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT (StdDrivers_DocumentRetrievalDriver, StdLDrivers_DocumentRetrievalDriver) DEFINE_STANDARD_RTTIEXT (StdDrivers_DocumentRetrievalDriver, StdLDrivers_DocumentRetrievalDriver)
}; };

4
src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx
View File

@ -24,12 +24,12 @@ class StdLDrivers_DocumentRetrievalDriver : public PCDM_RetrievalDriver
{ {
public: public:
//! Create an empty TDocStd_Document. //! Create an empty TDocStd_Document.
Standard_EXPORT virtual Handle(CDM_Document) CreateDocument(); Standard_EXPORT virtual Handle(CDM_Document) CreateDocument() Standard_OVERRIDE;
//! Retrieve the content of a file into a new document. //! Retrieve the content of a file into a new document.
Standard_EXPORT virtual void Read (const TCollection_ExtendedString& theFileName, Standard_EXPORT virtual void Read (const TCollection_ExtendedString& theFileName,
const Handle(CDM_Document)& theNewDocument, const Handle(CDM_Document)& theNewDocument,
const Handle(CDM_Application)& theApplication); const Handle(CDM_Application)& theApplication) Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT (StdLDrivers_DocumentRetrievalDriver, PCDM_RetrievalDriver) DEFINE_STANDARD_RTTIEXT (StdLDrivers_DocumentRetrievalDriver, PCDM_RetrievalDriver)