Updates for the latest gcc/clang compilers.

PDAL · Mar 29, 2019 · cd98970 · cd98970
1 parent cded921
commit cd98970
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
@@ -36,7 +36,7 @@ if(DEFINED ENV{ORACLE_HOME})
     ${ORACLE_HOME}/OCI/include) # Oracle XE on Windows
 
   set(ORACLE_OCI_NAMES clntsh libclntsh oci)
-  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 nnz12 libnnz11 libnnz12 ociw32)
+  set(ORACLE_NNZ_NAMES nnz10 libnnz10 nnz11 nnz12 nnz18 libnnz11 libnnz12 libnnz18 ociw32)
   set(ORACLE_OCCI_NAMES libocci occi oraocci10 oraocci11)
 
   set(ORACLE_LIB_DIR 

diff --git a/pdal/Metadata.hpp b/pdal/Metadata.hpp
@@ -376,7 +376,7 @@ T value(const std::string& type, const std::string& value)
     {
         std::vector<uint8_t> encVal = Utils::base64_decode(value);
         encVal.resize(sizeof(T));
-        memcpy(&t, encVal.data(), sizeof(T));
+        t = *(reinterpret_cast<T *>(encVal.data()));
     }
     else if (!Utils::fromString(value, t))
         throw value_error();

diff --git a/plugins/i3s/lepcc/CMakeLists.txt b/plugins/i3s/lepcc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.5)
 
 project(LEPCC CXX C)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)

diff --git a/plugins/sqlite/io/SQLiteWriter.cpp b/plugins/sqlite/io/SQLiteWriter.cpp
@@ -481,7 +481,7 @@ void SQLiteWriter::writeTile(const PointViewPtr view)
                 compressor.compress(outbuf.data(), size);
             }
         }
-        catch (pdal_error)
+        catch (pdal_error&)
         {
             compressor.done();
             throw;

diff --git a/vendor/kazhdan/MultiGridOctreeData.System.inl b/vendor/kazhdan/MultiGridOctreeData.System.inl
@@ -1588,10 +1588,13 @@ void Octree< Real >::_updateConstraintsFromCoarser( const FEMSystemFunctor& F ,
 	_localDepthAndOffset( node , d , off );
 
 	// Offset the constraints using the solution from lower resolutions.
-	int startX , endX , startY , endY , startZ , endZ;
+	int startX = 0, endX = 0, startY = 0, endY = 0, startZ = 0, endZ = 0;
+
 	_SetParentOverlapBounds< FEMDegree , FEMDegree >( node , startX , endX , startY , endY , startZ , endZ );
 
-	for( int x=startX ; x<endX ; x++ ) for( int y=startY ; y<endY ; y++ ) for( int z=startZ ; z<endZ ; z++ )
+	for( int x=startX ; x<endX ; x++ )
+        for( int y=startY ; y<endY ; y++ )
+            for( int z=startZ ; z<endZ ; z++ )
 		if( _isValidFEMNode( pNeighbors.neighbors[x][y][z] ) )
 		{
 			const TreeOctNode* _node = pNeighbors.neighbors[x][y][z];