summaryrefslogtreecommitdiffstats
path: root/lldb/source/Core/Scalar.cpp
diff options
context:
space:
mode:
authorVince Harron <vharron@google.com>2015-01-15 20:08:35 +0000
committerVince Harron <vharron@google.com>2015-01-15 20:08:35 +0000
commit5275aaa0cc7fe845e2556cfc66a37cac6d9f3731 (patch)
treeaf178ddbda5967dbc61583ea733d5ad1be5ea436 /lldb/source/Core/Scalar.cpp
parent66c9fb0d52b00d81a2f7c98f493ff86f72de045c (diff)
downloadbcm5719-llvm-5275aaa0cc7fe845e2556cfc66a37cac6d9f3731.tar.gz
bcm5719-llvm-5275aaa0cc7fe845e2556cfc66a37cac6d9f3731.zip
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/Core/Scalar.cpp')
-rw-r--r--lldb/source/Core/Scalar.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Core/Scalar.cpp b/lldb/source/Core/Scalar.cpp
index 1bfe6f2f1ba..0e9b98dc4ab 100644
--- a/lldb/source/Core/Scalar.cpp
+++ b/lldb/source/Core/Scalar.cpp
@@ -17,6 +17,7 @@
#include "lldb/Core/Stream.h"
#include "lldb/Core/DataExtractor.h"
#include "lldb/Host/Endian.h"
+#include "lldb/Host/StringConvert.h"
#include "Plugins/Process/Utility/InstructionUtils.h"
@@ -1790,7 +1791,7 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, size_t by
case eEncodingUint:
if (byte_size <= sizeof (unsigned long long))
{
- uint64_t uval64 = Args::StringToUInt64(value_str, UINT64_MAX, 0, &success);
+ uint64_t uval64 = StringConvert::ToUInt64(value_str, UINT64_MAX, 0, &success);
if (!success)
error.SetErrorStringWithFormat ("'%s' is not a valid unsigned integer string value", value_str);
else if (!UIntValueIsValidForSize (uval64, byte_size))
@@ -1819,7 +1820,7 @@ Scalar::SetValueFromCString (const char *value_str, Encoding encoding, size_t by
case eEncodingSint:
if (byte_size <= sizeof (long long))
{
- uint64_t sval64 = Args::StringToSInt64(value_str, INT64_MAX, 0, &success);
+ uint64_t sval64 = StringConvert::ToSInt64(value_str, INT64_MAX, 0, &success);
if (!success)
error.SetErrorStringWithFormat ("'%s' is not a valid signed integer string value", value_str);
else if (!SIntValueIsValidForSize (sval64, byte_size))
OpenPOWER on IntegriCloud