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

diff --git a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
index cf54ded8a084ea52668b5607988f66003b64a062..12ea5ff92fb3e5c95ff580a4b1a70de5e85206d0 100644 (file)
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_3.cxx
@@ -460,9 +460,9 @@ void BOPAlgo_PaveFiller::PerformEE()
           if (bLineLine) {
             // increase tolerance for Line/Line intersection, but do not update 
             // the vertex till its intersection with some other shape
-            Standard_Real aTol = (aCR1.Last() - aCR1.First()) / 2.;
-            if (aTol > aTolVnew) {
-              aTolVnew = aTol;
+            Standard_Real aTolMin = (aCR1.Last() - aCR1.First()) / 2.;
+            if (aTolMin > aTolVnew) {
+              aTolVnew = aTolMin;
             }
           }
           // <-LXBR

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

diff --git a/src/Standard/Standard_Type.hxx b/src/Standard/Standard_Type.hxx
index 87b52c2525c0d233cfdfc8bbb23c3480bb682846..c6819aa5bd9867532d36ea08384c782841b0ac5f 100644 (file)
--- a/src/Standard/Standard_Type.hxx
+++ b/src/Standard/Standard_Type.hxx
@@ -184,8 +184,12 @@ namespace opencascade {
   template <typename T>
   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
     (void)myInstance;
+#endif
 
     // static variable inside function ensures that descriptors
     // are initialized in correct sequence

diff --git a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx
index 3cbb65be3e395473bb8968709eb290678b14f70c..d68339758a818b548232b86de1db81db56596c56 100644 (file)
--- a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx
+++ b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx
@@ -21,7 +21,7 @@ class StdDrivers_DocumentRetrievalDriver : public StdLDrivers_DocumentRetrievalD
 {
 public:
   //! 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)
 };

diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx
index af63116504369fcd58decdb2de80e0170999a194..4661fdd58d33bdc1b89657e0f61dfbacd8cc4cdc 100644 (file)
--- a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx
+++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx
@@ -24,12 +24,12 @@ class StdLDrivers_DocumentRetrievalDriver : public PCDM_RetrievalDriver
 {
 public:
   //! 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.
   Standard_EXPORT virtual void Read (const TCollection_ExtendedString& theFileName,
                                      const Handle(CDM_Document)&       theNewDocument,
-                                     const Handle(CDM_Application)&    theApplication);
+                                     const Handle(CDM_Application)&    theApplication) Standard_OVERRIDE;
 
   DEFINE_STANDARD_RTTIEXT (StdLDrivers_DocumentRetrievalDriver, PCDM_RetrievalDriver)