dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid -Wdynamic-class-memaccess warning on clang in CheckCaches()

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-28 11:50:30 +01:00
parent f331ae8f81
commit f8e34838c6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openttd.cpp
View File

@@ -1273,7 +1273,6 @@ void SwitchToMode(SwitchMode new_mode)
SmallMapWindow::RebuildColourIndexIfNecessary(); SmallMapWindow::RebuildColourIndexIfNecessary();
} }
/** /**
* Check the validity of some of the caches. * Check the validity of some of the caches.
* Especially in the sense of desyncs between * Especially in the sense of desyncs between
@@ -1365,21 +1364,21 @@ void CheckCaches(bool force_check)
gro_cache[length] = Train::From(u)->gcache; gro_cache[length] = Train::From(u)->gcache;
tra_cache[length] = Train::From(u)->tcache; tra_cache[length] = Train::From(u)->tcache;
veh_old[length] = CallocT<Train>(1); veh_old[length] = CallocT<Train>(1);
MemCpyT((Train *) veh_old[length], Train::From(u)); memcpy((void *) veh_old[length], (const void *) Train::From(u), sizeof(Train));
break; break;
case VEH_ROAD: case VEH_ROAD:
gro_cache[length] = RoadVehicle::From(u)->gcache; gro_cache[length] = RoadVehicle::From(u)->gcache;
veh_old[length] = CallocT<RoadVehicle>(1); veh_old[length] = CallocT<RoadVehicle>(1);
MemCpyT((RoadVehicle *) veh_old[length], RoadVehicle::From(u)); memcpy((void *) veh_old[length], (const void *) RoadVehicle::From(u), sizeof(RoadVehicle));
break; break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
air_cache[length] = Aircraft::From(u)->acache; air_cache[length] = Aircraft::From(u)->acache;
veh_old[length] = CallocT<Aircraft>(1); veh_old[length] = CallocT<Aircraft>(1);
MemCpyT((Aircraft *) veh_old[length], Aircraft::From(u)); memcpy((void *) veh_old[length], (const void *) Aircraft::From(u), sizeof(Aircraft));
break; break;
default: default:
veh_old[length] = CallocT<Vehicle>(1); veh_old[length] = CallocT<Vehicle>(1);
MemCpyT(veh_old[length], u); memcpy((void *) veh_old[length], (const void *) u, sizeof(Vehicle));
break; break;
} }
length++; length++;