commit 5275aaa0cc7fe845e2556cfc66a37cac6d9f3731
author Vince Harron <vharron@google.com> Thu Jan 15 20:08:35 2015 +0000
committer Vince Harron <vharron@google.com> Thu Jan 15 20:08:35 2015 +0000
tree af178ddbda5967dbc61583ea733d5ad1be5ea436
parent 66c9fb0d52b00d81a2f7c98f493ff86f72de045c

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

lldb/source/Interpreter/OptionValueArray.cpp

diff --git a/lldb/source/Interpreter/OptionValueArray.cpp b/lldb/source/Interpreter/OptionValueArray.cpp
index c0d48c1..86d49c9 100644
--- a/lldb/source/Interpreter/OptionValueArray.cpp
+++ b/lldb/source/Interpreter/OptionValueArray.cpp
@@ -14,6 +14,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/Stream.h"
+#include "lldb/Host/StringConvert.h"
 #include "lldb/Interpreter/Args.h"
 
 using namespace lldb;
@@ -97,7 +98,7 @@
                 sub_value = end_bracket + 1;
             std::string index_str (name+1, end_bracket);
             const size_t array_count = m_values.size();
-            int32_t idx = Args::StringToSInt32(index_str.c_str(), INT32_MAX, 0, nullptr);
+            int32_t idx = StringConvert::ToSInt32(index_str.c_str(), INT32_MAX, 0, nullptr);
             if (idx != INT32_MAX)
             {
                 ;
@@ -177,7 +178,7 @@
     case eVarSetOperationInsertAfter:
         if (argc > 1)
         {
-            uint32_t idx = Args::StringToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX);
+            uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX);
             const uint32_t count = GetSize();
             if (idx > count)
             {
@@ -225,7 +226,7 @@
             for (i=0; i<argc; ++i)
             {
                 const size_t idx =
-                  Args::StringToSInt32(args.GetArgumentAtIndex(i), INT32_MAX);
+                  StringConvert::ToSInt32(args.GetArgumentAtIndex(i), INT32_MAX);
                 if (idx >= size)
                 {
                     all_indexes_valid = false;
@@ -274,7 +275,7 @@
     case eVarSetOperationReplace:
         if (argc > 1)
         {
-            uint32_t idx = Args::StringToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX);
+            uint32_t idx = StringConvert::ToUInt32(args.GetArgumentAtIndex(0), UINT32_MAX);
             const uint32_t count = GetSize();
             if (idx > count)
             {