From 06e2f0bcc39cb542ed39bc5aab8b13636265a578 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Fri, 2 May 2025 09:46:20 +0200 Subject: [PATCH] Fix cast to void for Win64 Make what could be considered a legendary hack less brittle. C4312: 'reinterpret_cast': conversion from 'long' to 'void *' of greater size Signed-off-by: Ralph Sennhauser --- .../tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp index 2084aee508..bd95d30898 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -557,7 +557,7 @@ void MapSidebar::OnFirstDisplay() AtObj sizes = AtlasObject::LoadFromJSON(*qrySizes.sizes); wxChoice* sizeChoice = wxDynamicCast(FindWindow(ID_RandomSize), wxChoice); for (AtIter s = sizes["Data"]["item"]; s.defined(); ++s) - sizeChoice->Append(wxString::FromUTF8(s["Name"]), reinterpret_cast((*s["Tiles"]).getLong())); + sizeChoice->Append(wxString::FromUTF8(s["Name"]), reinterpret_cast(static_cast((*s["Tiles"]).getLong()))); sizeChoice->SetSelection(0); // Load the RMS script list