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

"stdc++" is added to CSF_ThreadLibs in CMake script to make DRAWEXE built well.

In addition, TKVCAF added in CMake script for OCAF MFC sample, and Yacc and Lex files added in src/StepFile/FILES to make it consistent with actual contents of the package.

adm/cmake/occt_csf.cmake

@@ -74,7 +74,7 @@ else()
     set (CSF_ThreadLibs  "c")
     set (CSF_OpenGlLibs  "EGL GLESv2")
   elseif (UNIX)
-    set (CSF_ThreadLibs  "pthread rt")
+    set (CSF_ThreadLibs  "pthread rt stdc++")
     set (CSF_OpenGlLibs  "GLU GL")
     set (CSF_XwLibs      "X11 Xext Xmu Xi")
 

samples/mfc/standard/06_Ocaf/CMakeLists.txt

@@ -66,4 +66,4 @@ include_directories (${CMAKE_BINARY_DIR}/inc
                      ${Ocaf_SRC_DIR}
                      ${MFC_STANDARD_SAMPLES_DIR}/Common)
 
-target_link_libraries (Ocaf mfcsample TKLCAF TKBO)
+target_link_libraries (Ocaf mfcsample TKLCAF TKVCAF TKBO)

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.;
+            Standard_Real aTolMin = (aCR1.Last() - aCR1.First()) / 2.;
-            if (aTol > aTolVnew) {
+            if (aTolMin > aTolVnew) {
-              aTolVnew = aTol;
+              aTolVnew = aTolMin;
             }
           }
           // <-LXBR

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)) {
+    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);
     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)) {
+    const TopoDS_Shape& aV = (aPDS->HasShapeSD(nVx, nVSD) ? aPDS->Shape(nVSD) : aVx);
-      aV=aPDS->Shape(nVSD);
-    }
-    else {
-      aV=aVx;
-    }
     iV = aMVI.Find(aV);
     //
     BOPDS_CoupleOfPaveBlocks &aCPB=theMVCPB.ChangeFromKey(aVx);

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

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)
 };

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)
 

src/StepFile/FILES

@@ -10,3 +10,5 @@ StepFile_Read.hxx
 StepFile_Transfer.hxx
 stepread.c
 stepread.ph
+step.lex
+step.yacc