Bugfix/fix compiler pragma for clang (#317)

rrsettgast · web-flow · commit 1531241583ee · 2024-02-12T10:47:32.000-08:00
* change pragma guards to check that the compiler is not clang
diff --git a/src/MallocBuffer.hpp b/src/MallocBuffer.hpp
@@ -132,12 +132,15 @@ class MallocBuffer : public bufferManipulation::VoidBuffer
     LVARRAY_ERROR_IF_NE( space, MemorySpace::host );
     std::size_t newSpaceSize = newCapacity * sizeof( T );
 
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Walloc-size-larger-than="
+#endif
     // TODO: If std::is_trivially_copyable_v< T > then we could use std::realloc.
     T * const newPtr = reinterpret_cast< T * >( std::malloc( newSpaceSize ) );
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
-
+#endif
 
     std::ptrdiff_t const overlapAmount = math::min( newCapacity, size );
     arrayManipulation::uninitializedMove( newPtr, overlapAmount, m_data );
diff --git a/src/arrayManipulation.hpp b/src/arrayManipulation.hpp
@@ -298,11 +298,15 @@ void resize( T * const LVARRAY_RESTRICT ptr,
     if( newSize - size > 0 )
     {
       std::size_t const sizeDiff = integerConversion< std::size_t >( newSize - size );
+#if !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #pragma GCC diagnostic ignored "-Wstringop-overflow="
+#endif
       memset( reinterpret_cast< void * >( ptr + size ), 0, ( sizeDiff ) * sizeof( T ) );
+#if !defined(__clang__)
 #pragma GCC diagnostic pop
+#endif
     }
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -298,11 +298,15 @@ void resize( T * const LVARRAY_RESTRICT ptr,`
`298`	`298`	`if( newSize - size > 0 )`
`299`	`299`	`{`
`300`	`300`	`std::size_t const sizeDiff = integerConversion< std::size_t >( newSize - size );`
	`301`	`+#if !defined(__clang__)`
`301`	`302`	`#pragma GCC diagnostic push`
`302`	`303`	`#pragma GCC diagnostic ignored "-Warray-bounds"`
`303`	`304`	`#pragma GCC diagnostic ignored "-Wstringop-overflow="`
	`305`	`+#endif`
`304`	`306`	`memset( reinterpret_cast< void * >( ptr + size ), 0, ( sizeDiff ) * sizeof( T ) );`
	`307`	`+#if !defined(__clang__)`
`305`	`308`	`#pragma GCC diagnostic pop`
	`309`	`+#endif`
`306`	`310`	`}`
`307`	`311`	`}`
`308`	`312`	`else`