Merge pull request #708 from Repiteo/msvc-fixes

Various MSVC compilation fixes
Zylann · Oct 7, 2024 · bd6efa8 · bd6efa8
2 parents 2131e7a + 0f4b350
commit bd6efa8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 4 deletions.
diff --git a/edition/funcs.cpp b/edition/funcs.cpp
@@ -295,7 +295,6 @@ bool indices_to_bitarray_u16(Span<const int32_t> indices, DynamicBitset &bitarra
 				false,
 				format("Index {} is out of supported range 0..{}", i, max_supported_value)
 		);
-		return false;
 	}
 #endif
 

diff --git a/generators/graph/node_type_db.cpp b/generators/graph/node_type_db.cpp
@@ -244,7 +244,7 @@ VoxelGraphFunction::Port make_port_from_io_node(const ProgramGraph::Node &node,
 }
 
 bool is_node_matching_port(const ProgramGraph::Node &node, const VoxelGraphFunction::Port &port) {
-	if (node.type_id != port.type) {
+	if (node.type_id != static_cast<uint32_t>(port.type)) {
 		return false;
 	}
 

diff --git a/meshers/transvoxel/transvoxel.cpp b/meshers/transvoxel/transvoxel.cpp
@@ -7,6 +7,10 @@
 #include "../../util/profiling.h"
 #include "transvoxel_tables.cpp"
 
+#if defined(_MSC_VER)
+#pragma warning(disable : 4701) // Potentially uninitialized local variable used.
+#endif
+
 // #define VOXEL_TRANSVOXEL_REUSE_VERTEX_ON_COINCIDENT_CASES
 
 namespace zylann::voxel::transvoxel {

diff --git a/streams/sqlite/connection.cpp b/streams/sqlite/connection.cpp
@@ -417,6 +417,7 @@ bool Connection::save_block(const BlockLocation loc, const Span<const uint8_t> b
 			update_block_statement = _update_instance_block_statement;
 			break;
 		default:
+			update_block_statement = nullptr;
 			CRASH_NOW();
 	}
 
@@ -471,6 +472,7 @@ VoxelStream::ResultCode Connection::load_block(
 			get_block_statement = _get_instance_block_statement;
 			break;
 		default:
+			get_block_statement = nullptr;
 			CRASH_NOW();
 	}
 

diff --git a/streams/voxel_block_serializer.cpp b/streams/voxel_block_serializer.cpp
@@ -210,7 +210,6 @@ bool deserialize_metadata(VoxelMetadata &meta, MemoryReader &mr) {
 				return false;
 			}
 	}
-	return false;
 }
 
 bool deserialize_metadata(Span<const uint8_t> p_src, VoxelBuffer &buffer) {

diff --git a/terrain/instancing/voxel_instance_generator.cpp b/terrain/instancing/voxel_instance_generator.cpp
@@ -9,6 +9,10 @@
 #include "../../util/math/triangle.h"
 #include "../../util/profiling.h"
 
+#if defined(_MSC_VER)
+#pragma warning(disable : 4701) // Potentially uninitialized local variable used.
+#endif
+
 namespace zylann::voxel {
 
 namespace {

diff --git a/thirdparty/fast_noise_2/SConscript b/thirdparty/fast_noise_2/SConscript
@@ -76,8 +76,8 @@ else:
     # env_fn2.Append(CXXFLAGS=["-Wno-shadow"])
     # if '-Wshadow' in env_fn2['CXXFLAGS']:
     #     env_fn2['CXXFLAGS'].remove('-Wshadow')
-    env_fn2.disable_warnings()
 
+env_fn2.disable_warnings()
 env_fn2_scalar = env_fn2.Clone()
 env_fn2_sse2 = env_fn2.Clone()
 env_fn2_sse3 = env_fn2.Clone()

diff --git a/util/string/expression_parser.cpp b/util/string/expression_parser.cpp
@@ -5,6 +5,10 @@
 #include <algorithm>
 #include <cmath>
 
+#if defined(_MSC_VER)
+#pragma warning(disable : 4701) // Potentially uninitialized local variable used.
+#endif
+
 namespace zylann {
 namespace ExpressionParser {
-Original file line number
+Diff line change
@@ Expand Up @@
     				false,
     				format("Index {} is out of supported range 0..{}", i, max_supported_value)
     		);
-    		return false;
     	}
     #endif
@@ Expand Down @@