64 bit clean now

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1789 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index d3966279b4fab960ca5c606aaffc4c3649ff2053..8633bef934014931f67991b6a1e9aafc13f4f738 100644 (file)
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -16,6 +16,7 @@
 #include <map>
 #include <set>
 #include <iostream>
+
 using namespace cl;
 using std::map;
 using std::pair;
@@ -354,7 +355,7 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumValueBase::getOptionWidth() const {
   unsigned BaseSize = Option::getOptionWidth();
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+8);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+8);
   return BaseSize;
 }
 
@@ -384,7 +385,7 @@ bool EnumFlagsBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumFlagsBase::getOptionWidth() const {
   unsigned BaseSize = 0;
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+6);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+6);
   return BaseSize;
 }
 
@@ -417,7 +418,7 @@ bool EnumListBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumListBase::getOptionWidth() const {
   unsigned BaseSize = 0;
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+6);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+6);
   return BaseSize;
 }
 

diff --git a/support/lib/Support/CommandLine.cpp b/support/lib/Support/CommandLine.cpp
index d3966279b4fab960ca5c606aaffc4c3649ff2053..8633bef934014931f67991b6a1e9aafc13f4f738 100644 (file)
--- a/support/lib/Support/CommandLine.cpp
+++ b/support/lib/Support/CommandLine.cpp
@@ -16,6 +16,7 @@
 #include <map>
 #include <set>
 #include <iostream>
+
 using namespace cl;
 using std::map;
 using std::pair;
@@ -354,7 +355,7 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumValueBase::getOptionWidth() const {
   unsigned BaseSize = Option::getOptionWidth();
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+8);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+8);
   return BaseSize;
 }
 
@@ -384,7 +385,7 @@ bool EnumFlagsBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumFlagsBase::getOptionWidth() const {
   unsigned BaseSize = 0;
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+6);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+6);
   return BaseSize;
 }
 
@@ -417,7 +418,7 @@ bool EnumListBase::handleOccurance(const char *ArgName, const string &Arg) {
 unsigned EnumListBase::getOptionWidth() const {
   unsigned BaseSize = 0;
   for (unsigned i = 0; i < ValueMap.size(); ++i)
-    BaseSize = std::max(BaseSize, std::strlen(ValueMap[i].first)+6);
+    BaseSize = std::max(BaseSize, (unsigned)std::strlen(ValueMap[i].first)+6);
   return BaseSize;
 }