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

Fix rebase_delta type mismatch 

See #984. GCC wasn't complaining about this on x64 for some reason.

Also reordered includes.
develop
lethosor 2016-09-28 20:43:02 -04:00
parent 714ba1a030
commit a5338d2f59
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/include/VersionInfo.h
Unescape Escape View File

@ -25,13 +25,13 @@ distribution.
#pragma once #pragma once
#include "Pragma.h" #include <algorithm>
#include "Export.h"
/* #include "Types.h" */
#include <map> #include <map>
#include <sys/types.h> #include <sys/types.h>
#include <vector> #include <vector>
#include <algorithm>
#include "Export.h"
#include "Pragma.h"
namespace DFHack namespace DFHack
{ {
@ -53,7 +53,7 @@ namespace DFHack
std::map <std::string, uintptr_t> Addresses; std::map <std::string, uintptr_t> Addresses;
std::map <std::string, uintptr_t> VTables; std::map <std::string, uintptr_t> VTables;
uintptr_t base; uintptr_t base;
uintptr_t rebase_delta; intptr_t rebase_delta;
std::string version; std::string version;
OSType OS; OSType OS;
public: public:
@ -76,7 +76,7 @@ namespace DFHack
}; };
uintptr_t getBase () const { return base; }; uintptr_t getBase () const { return base; };
int getRebaseDelta() const { return rebase_delta; } intptr_t getRebaseDelta() const { return rebase_delta; }
void setBase (const uintptr_t _base) { base = _base; }; void setBase (const uintptr_t _base) { base = _base; };
void rebaseTo(const uintptr_t new_base) void rebaseTo(const uintptr_t new_base)
{ {