Merged Eli Friedman's linux build changes where he added Makefile files that
enabled LLVM make style building and made this compile LLDB on Mac OS X. We
can now iterate on this to make the build work on both linux and macosx.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@108009 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Interpreter/Args.cpp b/source/Interpreter/Args.cpp
index 3b0019a..78c1003 100644
--- a/source/Interpreter/Args.cpp
+++ b/source/Interpreter/Args.cpp
@@ -779,7 +779,7 @@
for (++pos; pos != end; ++pos)
{
- int new_size = (*pos).size();
+ size_t new_size = (*pos).size();
// First trim common_prefix if it is longer than the current element:
if (common_prefix.size() > new_size)
@@ -787,7 +787,7 @@
// Then trim it at the first disparity:
- for (int i = 0; i < common_prefix.size(); i++)
+ for (size_t i = 0; i < common_prefix.size(); i++)
{
if ((*pos)[i] != common_prefix[i])
{
@@ -998,7 +998,7 @@
// So we have to build another Arg and pass that to getopt_long so it doesn't
// change the one we have.
- std::vector<const char *> dummy_vec(GetArgumentVector(), GetArgumentVector() + GetArgumentCount() + 1);
+ std::vector<const char *> dummy_vec (GetArgumentVector(), GetArgumentVector() + GetArgumentCount() + 1);
bool failed_once = false;
uint32_t dash_dash_pos = -1;
@@ -1009,7 +1009,10 @@
int parse_start = optind;
int long_options_index = -1;
- val = ::getopt_long (dummy_vec.size() - 1,(char *const *) dummy_vec.data(), sstr.GetData(), long_options,
+ val = ::getopt_long (dummy_vec.size() - 1,
+ (char *const *) dummy_vec.data(),
+ sstr.GetData(),
+ long_options,
&long_options_index);
if (val == -1)