Re-enable warnings

pharo-project · May 2, 2024 · 0b0f26c · 0b0f26c
1 parent 68a7a8e
commit 0b0f26c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -324,8 +324,11 @@ add_compile_options(
     -Wno-pointer-integer-compare
     -Wno-unknown-pragmas
     -Wno-pointer-sign
+<<<<<<< HEAD
     -Wno-constant-conversion
     -Wno-tautological-pointer-compare
+=======
+>>>>>>> 66015f0470 (Re-enable warnings)
     -Wno-deprecated-declarations
     -Wno-pointer-to-int-cast
     -Wno-compare-distinct-pointer-types