Enforce common compiler flags

Author: chusitoo

CMakeLists.txt

@@ -21,6 +21,34 @@ if(WITH_SPAN)
   add_compile_options(-DFLATBUSH_SPAN)
 endif()
 
+set(FLATBUSH_WARNING_FLAGS "")
+if(MSVC)
+  set(FLATBUSH_WARNING_FLAGS
+    /EHsc
+    /W4
+    /WX
+    /permissive-
+  )
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  set(FLATBUSH_WARNING_FLAGS
+    -Wall
+    -Wextra
+    -Werror
+    -Wunused
+    -Wundef
+    -Wextra-semi
+    -Wshadow
+    -Wconversion
+    -Wsign-conversion
+    -Wdouble-promotion
+    -Wcast-align
+    -Wimplicit-fallthrough
+  )
+  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    list(APPEND FLATBUSH_WARNING_FLAGS -Wno-gnu-zero-variadic-macro-arguments)
+  endif()
+endif()
+
 if(WITH_BENCHMARKS)
   set(CMAKE_BUILD_TYPE Release)
 
@@ -57,6 +85,7 @@ if(WITH_TESTS)
 
   set(test_target unit_test)
   add_executable(${test_target} "test.cpp")
+  target_compile_options(${test_target} PRIVATE ${FLATBUSH_WARNING_FLAGS})
   target_link_libraries(${test_target} PRIVATE gtest_main)
   gtest_discover_tests(${test_target})
 endif()

flatbush.h

@@ -343,11 +343,6 @@ inline void updateBounds(Box<ArrayType>& ioSrc, const Box<ArrayType>& iBox) noex
   ioSrc.mMaxY = std::max(ioSrc.mMaxY, iBox.mMaxY);
 }
 
-template <typename ArrayType>
-inline double axisDistance(ArrayType iValue, ArrayType iMin, ArrayType iMax) noexcept {
-  return std::max(0.0, std::max<double>(iMin - iValue, iValue - iMax));
-}
-
 template <typename ArrayType>
 inline double computeDistanceSquared(const Point<ArrayType>& iPoint,
                                      const Box<ArrayType>& iBox) noexcept {
@@ -1168,7 +1163,7 @@ class FlatbushBuilder {
     mItems.reserve(iNumItems);
   }
 
-  inline void clear() noexcept { mItems.clear(); };
+  inline void clear() noexcept { mItems.clear(); }
 
   inline size_t add(const Box<ArrayType>& iBox) noexcept {
     mItems.push_back(iBox);
@@ -1293,13 +1288,13 @@ class Flatbush {
                                 double iMaxDistance = gMaxDistance,
                                 const FilterCb& iFilterFn = nullptr) const noexcept;
 
-  inline size_t nodeSize() const noexcept { return *detail::bit_cast<const uint16_t*>(&mData[2]); };
+  inline size_t nodeSize() const noexcept { return *detail::bit_cast<const uint16_t*>(&mData[2]); }
 
-  inline size_t numItems() const noexcept { return *detail::bit_cast<const uint32_t*>(&mData[4]); };
+  inline size_t numItems() const noexcept { return *detail::bit_cast<const uint32_t*>(&mData[4]); }
 
-  inline size_t indexSize() const noexcept { return mBoxes.size(); };
+  inline size_t indexSize() const noexcept { return mBoxes.size(); }
 
-  inline span<const uint8_t> data() const noexcept { return {mData.data(), mData.capacity()}; };
+  inline span<const uint8_t> data() const noexcept { return {mData.data(), mData.capacity()}; }
 
   friend class FlatbushBuilder<ArrayType>;
 
@@ -1308,7 +1303,8 @@ class Flatbush {
   static constexpr ArrayType cMinValue = std::numeric_limits<ArrayType>::lowest();
 
   static inline double axisDistance(ArrayType iValue, ArrayType iMin, ArrayType iMax) noexcept {
-    return iValue < iMin ? iMin - iValue : std::max<double>(iValue - iMax, 0.0);
+    return std::max(
+        0.0, std::max(static_cast<double>(iMin - iValue), static_cast<double>(iValue - iMax)));
   }
 
   inline bool canDoSearch(const Box<ArrayType>& iBounds) const {
@@ -1613,16 +1609,18 @@ void Flatbush<ArrayType>::sort(std::vector<uint32_t>& iValues,
 #else
           const auto wVals = _mm_xor_si128(
               _mm_loadu_si128(detail::bit_cast<const __m128i*>(&iValues[wPos])), detail::kOffset32);
-          const auto wMask =
-              ~_mm_movemask_ps(_mm_castsi128_ps(_mm_cmpgt_epi32(wPivotVecS128, wVals))) & 0xFU;
+          const auto wMask = ~static_cast<unsigned>(_mm_movemask_ps(
+                                 _mm_castsi128_ps(_mm_cmpgt_epi32(wPivotVecS128, wVals)))) &
+                             0xFU;
 #endif
           if (wMask) {
 #ifdef _MSC_VER
             unsigned long wBitIdx;
             _BitScanForward(&wBitIdx, static_cast<unsigned>(wMask));
             wPivotLeft = wPos + wBitIdx - 1;
 #else
-            wPivotLeft = wPos + __builtin_ctz(static_cast<unsigned>(wMask)) - 1;
+            wPivotLeft =
+                wPos + static_cast<size_t>(__builtin_ctz(static_cast<unsigned>(wMask))) - 1;
 #endif
             break;
           }
@@ -1647,16 +1645,19 @@ void Flatbush<ArrayType>::sort(std::vector<uint32_t>& iValues,
 #else
           const auto wVals = _mm_xor_si128(
               _mm_loadu_si128(detail::bit_cast<const __m128i*>(&iValues[wPos])), detail::kOffset32);
-          const auto wMask =
-              ~_mm_movemask_ps(_mm_castsi128_ps(_mm_cmpgt_epi32(wVals, wPivotVecS128))) & 0xFU;
+          const auto wMask = ~static_cast<unsigned>(_mm_movemask_ps(
+                                 _mm_castsi128_ps(_mm_cmpgt_epi32(wVals, wPivotVecS128)))) &
+                             0xFU;
 #endif
           if (wMask) {
 #ifdef _MSC_VER
             unsigned long wBitIdx;
             _BitScanReverse(&wBitIdx, static_cast<unsigned>(wMask));
             wPivotRight = wPos + wBitIdx + 1;
 #else
-            wPivotRight = wPos + (31 - __builtin_clz(static_cast<unsigned>(wMask))) + 1;
+            wPivotRight =
+                wPos + (31U - static_cast<unsigned>(__builtin_clz(static_cast<unsigned>(wMask)))) +
+                1;
 #endif
             break;
           }