diff options
| author | Vince Harron <vharron@google.com> | 2015-01-15 20:08:35 +0000 |
|---|---|---|
| committer | Vince Harron <vharron@google.com> | 2015-01-15 20:08:35 +0000 |
| commit | 5275aaa0cc7fe845e2556cfc66a37cac6d9f3731 (patch) | |
| tree | af178ddbda5967dbc61583ea733d5ad1be5ea436 /lldb/source/Commands/CommandObjectMemory.cpp | |
| parent | 66c9fb0d52b00d81a2f7c98f493ff86f72de045c (diff) | |
| download | llvm-5275aaa0cc7fe845e2556cfc66a37cac6d9f3731.zip llvm-5275aaa0cc7fe845e2556cfc66a37cac6d9f3731.tar.gz llvm-5275aaa0cc7fe845e2556cfc66a37cac6d9f3731.tar.bz2 | |
Moved Args::StringToXIntYZ to StringConvert::ToXIntYZ
The refactor was motivated by some comments that Greg made
http://reviews.llvm.org/D6918
and also to break a dependency cascade that caused functions linking
in string->int conversion functions to pull in most of lldb
llvm-svn: 226199
Diffstat (limited to 'lldb/source/Commands/CommandObjectMemory.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectMemory.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lldb/source/Commands/CommandObjectMemory.cpp b/lldb/source/Commands/CommandObjectMemory.cpp index 6c06ec8..569d13a 100644 --- a/lldb/source/Commands/CommandObjectMemory.cpp +++ b/lldb/source/Commands/CommandObjectMemory.cpp @@ -24,6 +24,7 @@ #include "lldb/Core/StreamString.h" #include "lldb/Core/ValueObjectMemory.h" #include "lldb/DataFormatters/ValueObjectPrinter.h" +#include "lldb/Host/StringConvert.h" #include "lldb/Interpreter/Args.h" #include "lldb/Interpreter/CommandReturnObject.h" #include "lldb/Interpreter/CommandInterpreter.h" @@ -1293,7 +1294,7 @@ public: case 'o': { bool success; - m_infile_offset = Args::StringToUInt64(option_arg, 0, 0, &success); + m_infile_offset = StringConvert::ToUInt64(option_arg, 0, 0, &success); if (!success) { error.SetErrorStringWithFormat("invalid offset string '%s'", option_arg); @@ -1539,7 +1540,7 @@ protected: case eFormatPointer: // Decode hex bytes - uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 16, &success); + uval64 = StringConvert::ToUInt64(value_str, UINT64_MAX, 16, &success); if (!success) { result.AppendErrorWithFormat ("'%s' is not a valid hex string value.\n", value_str); @@ -1567,7 +1568,7 @@ protected: break; case eFormatBinary: - uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 2, &success); + uval64 = StringConvert::ToUInt64(value_str, UINT64_MAX, 2, &success); if (!success) { result.AppendErrorWithFormat ("'%s' is not a valid binary string value.\n", value_str); @@ -1607,7 +1608,7 @@ protected: break; case eFormatDecimal: - sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success); + sval64 = StringConvert::ToSInt64(value_str, INT64_MAX, 0, &success); if (!success) { result.AppendErrorWithFormat ("'%s' is not a valid signed decimal value.\n", value_str); @@ -1624,7 +1625,7 @@ protected: break; case eFormatUnsigned: - uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success); + uval64 = StringConvert::ToUInt64(value_str, UINT64_MAX, 0, &success); if (!success) { result.AppendErrorWithFormat ("'%s' is not a valid unsigned decimal string value.\n", value_str); @@ -1641,7 +1642,7 @@ protected: break; case eFormatOctal: - uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 8, &success); + uval64 = StringConvert::ToUInt64(value_str, UINT64_MAX, 8, &success); if (!success) { result.AppendErrorWithFormat ("'%s' is not a valid octal string value.\n", value_str); |