Merge pull request #1265 from johnhaddon/clangFixes

Fixes for Clang 13

Author: johnhaddon

SConstruct

@@ -3296,7 +3296,6 @@ appleseedEnvAppends = {
 	],
 	"CPPFLAGS" : [
 		"-DAPPLESEED_ENABLE_IMATH_INTEROP",
-		"-DAPPLESEED_USE_SSE",
 	],
 	"LIBPATH" : [
 		"$APPLESEED_LIB_PATH",
@@ -3305,6 +3304,9 @@ appleseedEnvAppends = {
 	],
 }
 
+if platform.machine() != "arm64" :
+	appleseedEnvAppends["CPPFLAGS"].append( "-DAPPLESEED_USE_SSE" )
+
 appleseedEnv.Append( **appleseedEnvAppends )
 
 appleseedPythonModuleEnv = pythonModuleEnv.Clone( **appleseedEnvSets )

include/IECore/DataAlgo.h

@@ -100,9 +100,9 @@ bool trait( const IECore::Data *data );
 /// };
 /// ```
 template<typename F, typename... Args>
-typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&functor, Args&&... args );
+typename std::invoke_result_t<F, Data *, Args&&...> dispatch( Data *data, F &&functor, Args&&... args );
 template<typename F, typename... Args>
-typename std::result_of<F( const Data *, Args&&... )>::type dispatch( const Data *data, F &&functor, Args&&... args );
+typename std::invoke_result_t<F, const Data *, Args&&...> dispatch( const Data *data, F &&functor, Args&&... args );
 
 } // namespace IECore
 

include/IECore/DataAlgo.inl

@@ -47,7 +47,7 @@ namespace IECore
 {
 
 template<class F, typename... Args>
-typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&functor, Args&&... args )
+typename std::invoke_result_t<F, Data *, Args&&...> dispatch( Data *data, F &&functor, Args&&... args )
 {
 	IECore::TypeId typeId = data->typeId();
 
@@ -199,7 +199,7 @@ typename std::result_of<F( Data *, Args&&... )>::type dispatch( Data *data, F &&
 }
 
 template<class F, typename... Args>
-typename std::result_of<F( const Data *, Args&&... )>::type dispatch( const Data *data, F &&functor, Args&&... args )
+typename std::invoke_result_t<F, const Data *, Args&&...> dispatch( const Data *data, F &&functor, Args&&... args )
 {
 	IECore::TypeId typeId = data->typeId();
 

src/IECore/StreamIndexedIO.cpp

@@ -944,7 +944,6 @@ class StreamIndexedIO::Reader
 				const char* readPtr = m_data;
 				char* writePtr = m_decompressedData;
 
-				size_t writeBufferSize = m_decompressedSize;
 				for ( size_t block = 0; block < info.numCompressedBlocks; ++block )
 				{
 					/// read the blosc header so we can decompress this block
@@ -960,7 +959,6 @@ class StreamIndexedIO::Reader
 
 					readPtr += compresedNumBytes;
 					writePtr += decompressedNumBytes;
-					writeBufferSize -= decompressedNumBytes;
 				}
 			}
 			else

src/IECoreScene/MeshPrimitiveEvaluator.cpp

@@ -524,7 +524,6 @@ void MeshPrimitiveEvaluator::calculateAverageNormals() const
 
 		const std::set<TriangleIndex> &connectedTriangles = vertexConnectivity[ vertexIndex ];
 
-		double angleTotal = 0.0;
 		for (std::set<TriangleIndex>::const_iterator faceIt = connectedTriangles.begin(); faceIt != connectedTriangles.end(); ++faceIt)
 		{
 
@@ -561,7 +560,6 @@ void MeshPrimitiveEvaluator::calculateAverageNormals() const
 			double cosAngle = e0.dot( e1 );
 			double angle = acos( cosAngle );
 			assert( angle >= -Imath::limits<double>::epsilon() );
-			angleTotal += angle;
 
 			const Imath::V3f &p0 = m_verts->readable()[ v0 ];
 			const Imath::V3f &p1 = m_verts->readable()[ v1 ];