Merge branch 'linuxfix' of https://github.com/sephiroth99/xenia into sephiroth99-linuxfix

2015-12-31 14:39:23 -08:00
parent 51271dae08 f5d4941716
commit a95be25e2f
16 changed files with 124 additions and 64 deletions
--- a/src/xenia/base/x64_context.cc
+++ b/src/xenia/base/x64_context.cc
@@ -45,8 +45,7 @@ std::string X64Context::GetStringFromValue(X64Register reg, bool hex) const {
                     static_cast<int>(X64Register::kXmm15)) {
        auto value = xmm_registers[static_cast<int>(reg) -
                                   static_cast<int>(X64Register::kXmm0)];
-        return hex ? string_util::to_hex_string(value)
-                   : string_util::to_string(value);
+        return hex ? string_util::to_hex_string(value) : xe::to_string(value);
      } else {
        assert_unhandled_case(reg);
        return "";