MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some more warnings (GCC 4.8)

develop
lethosor 2016-07-28 11:00:52 -04:00
parent adff13f4ab
commit 41a81f9021
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/MemAccess.h
Unescape Escape View File

@ -207,7 +207,7 @@ namespace DFHack
* attempt to copy a string from source address to target address. may truncate or leak, depending on platform * attempt to copy a string from source address to target address. may truncate or leak, depending on platform
* @return length copied * @return length copied
*/ */
size_t copySTLString(const void * address, const uint32_t target) size_t copySTLString(const void * address, const uintptr_t target)
{ {
std::string * strsrc = (std::string *) address; std::string * strsrc = (std::string *) address;
std::string * str = (std::string *) target; std::string * str = (std::string *) target;

14
library/modules/EventManager.cpp
Unescape Escape View File

@ -348,7 +348,7 @@ static void manageTickEvent(color_ostream& out) {
break; break;
EventHandler handle = (*tickQueue.begin()).second; EventHandler handle = (*tickQueue.begin()).second;
tickQueue.erase(tickQueue.begin()); tickQueue.erase(tickQueue.begin());
handle.eventHandler(out, (void*)tick); handle.eventHandler(out, (void*)intptr_t(tick));
toRemove.insert(handle); toRemove.insert(handle);
} }
if ( toRemove.empty() ) if ( toRemove.empty() )
@ -546,7 +546,7 @@ static void manageUnitDeathEvent(color_ostream& out) {
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) { for ( auto i = copy.begin(); i != copy.end(); i++ ) {
(*i).second.eventHandler(out, (void*)unit->id); (*i).second.eventHandler(out, (void*)intptr_t(unit->id));
} }
livingUnits.erase(unit->id); livingUnits.erase(unit->id);
} }
@ -582,7 +582,7 @@ static void manageItemCreationEvent(color_ostream& out) {
if ( item->flags.bits.spider_web ) if ( item->flags.bits.spider_web )
continue; continue;
for ( auto i = copy.begin(); i != copy.end(); i++ ) { for ( auto i = copy.begin(); i != copy.end(); i++ ) {
(*i).second.eventHandler(out, (void*)item->id); (*i).second.eventHandler(out, (void*)intptr_t(item->id));
} }
} }
nextItem = *df::global::item_next_id; nextItem = *df::global::item_next_id;
@ -609,7 +609,7 @@ static void manageBuildingEvent(color_ostream& out) {
buildings.insert(a); buildings.insert(a);
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler bob = (*b).second; EventHandler bob = (*b).second;
bob.eventHandler(out, (void*)a); bob.eventHandler(out, (void*)intptr_t(a));
} }
} }
nextBuilding = *df::global::building_next_id; nextBuilding = *df::global::building_next_id;
@ -625,7 +625,7 @@ static void manageBuildingEvent(color_ostream& out) {
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler bob = (*b).second; EventHandler bob = (*b).second;
bob.eventHandler(out, (void*)id); bob.eventHandler(out, (void*)intptr_t(id));
} }
a = buildings.erase(a); a = buildings.erase(a);
} }
@ -708,7 +708,7 @@ static void manageInvasionEvent(color_ostream& out) {
for ( auto a = copy.begin(); a != copy.end(); a++ ) { for ( auto a = copy.begin(); a != copy.end(); a++ ) {
EventHandler handle = (*a).second; EventHandler handle = (*a).second;
handle.eventHandler(out, (void*)(nextInvasion-1)); handle.eventHandler(out, (void*)intptr_t(nextInvasion-1));
} }
} }
@ -831,7 +831,7 @@ static void manageReportEvent(color_ostream& out) {
df::report* report = reports[a]; df::report* report = reports[a];
for ( auto b = copy.begin(); b != copy.end(); b++ ) { for ( auto b = copy.begin(); b != copy.end(); b++ ) {
EventHandler handle = (*b).second; EventHandler handle = (*b).second;
handle.eventHandler(out, (void*)report->id); handle.eventHandler(out, (void*)intptr_t(report->id));
} }
lastReport = report->id; lastReport = report->id;
} }