Merge branch 'develop' into c_bindings

This commit is contained in:
Ende! 2015-02-06 03:06:18 +01:00
commit 9d5e02ebcb
1 changed files with 3 additions and 1 deletions

View File

@ -34,6 +34,8 @@
#include <cstdarg> #include <cstdarg>
#include <cctype> #include <cctype>
#include <cstring> #include <cstring>
#include <cstdio>
#include <string>
namespace Verteron namespace Verteron
{ {
@ -622,7 +624,7 @@ const char* VXExactSymbolResolver::resolveSymbol(const VXInstructionInfo &info,
uint64_t &offset) uint64_t &offset)
{ {
std::unordered_map<uint64_t, std::string>::const_iterator iterator = m_symbolMap.find(address); std::unordered_map<uint64_t, std::string>::const_iterator iterator = m_symbolMap.find(address);
if (iterator != m_symbolMap.end()) if (iterator != m_symbolMap.cend())
{ {
offset = 0; offset = 0;
return iterator->second.c_str(); return iterator->second.c_str();