summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-09-28 16:43:09 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-09-28 16:43:09 +0200
commitd8268aae303d42544eb28a6f86da79e027f4882a (patch)
tree232149f57804040a3651a255cab7d67348aacfbc /modules
parent14e1f36e614686f3fea0c74fac3624d1027dd5cc (diff)
Fix MSVC warnings C4324, C4389, C4456, and C4459
Part of #66537.
Diffstat (limited to 'modules')
-rw-r--r--modules/gridmap/grid_map.cpp2
-rw-r--r--modules/raycast/SCsub3
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp
index 466a2efd21..05ce2b6147 100644
--- a/modules/gridmap/grid_map.cpp
+++ b/modules/gridmap/grid_map.cpp
@@ -1149,7 +1149,7 @@ TypedArray<Vector3i> GridMap::get_used_cells() const {
TypedArray<Vector3i> GridMap::get_used_cells_by_item(int p_item) const {
TypedArray<Vector3i> a;
for (const KeyValue<IndexKey, Cell> &E : cell_map) {
- if (E.value.item == p_item) {
+ if ((int)E.value.item == p_item) {
Vector3i p(E.key.x, E.key.y, E.key.z);
a.push_back(p);
}
diff --git a/modules/raycast/SCsub b/modules/raycast/SCsub
index 0670c7f468..20b05816e1 100644
--- a/modules/raycast/SCsub
+++ b/modules/raycast/SCsub
@@ -79,6 +79,9 @@ if env["builtin_embree"]:
else:
env.Append(LIBS=["psapi"])
+ if env.msvc: # Disable bogus warning about intentional struct padding.
+ env_raycast.Append(CCFLAGS=["/wd4324"])
+
env_thirdparty = env_raycast.Clone()
env_thirdparty.force_optimization_on_debug()
env_thirdparty.disable_warnings()