*** empty log message ***

llvm-svn: 3075

2 files changed, 4 insertions, 3 deletions

diff --git a/llvm/support/lib/Support/CommandLine.cpp b/llvm/support/lib/Support/CommandLine.cpp
index 433cefda7bf..e125ebeb822 100644
--- a/llvm/support/lib/Support/CommandLine.cpp
+++ b/llvm/support/lib/Support/CommandLine.cpp
@@ -138,7 +138,7 @@ static bool EatsUnboundedNumberOfValues(const Option *O) {
 }
 
 void cl::ParseCommandLineOptions(int &argc, char **argv,
-                                 const char *Overview = 0) {
+                                 const char *Overview) {
   assert((!getOpts().empty() || !getPositionalOpts().empty()) &&
          "No options specified, or ParseCommandLineOptions called more"
          " than once!");
@@ -396,7 +396,7 @@ void cl::ParseCommandLineOptions(int &argc, char **argv,
 // Option Base class implementation
 //
 
-bool Option::error(string Message, const char *ArgName = 0) {
+bool Option::error(string Message, const char *ArgName) {
   if (ArgName == 0) ArgName = ArgStr;
   if (ArgName[0] == 0)
     cerr << HelpStr;  // Be nice for positional arguments
diff --git a/llvm/support/lib/Support/PluginLoader.cpp b/llvm/support/lib/Support/PluginLoader.cpp
index c2e4e89813a..dce923af7f6 100644
--- a/llvm/support/lib/Support/PluginLoader.cpp
+++ b/llvm/support/lib/Support/PluginLoader.cpp
@@ -13,6 +13,7 @@
 #include "Support/CommandLine.h"
 #include <dlfcn.h>
 #include <link.h>
+#include <iostream>
 
 namespace {
   struct PluginLoader {
@@ -25,6 +26,6 @@ namespace {
 }
 
 // This causes operator= above to be invoked for every -load option.
-static cl::opt<PluginLoader, false, cl::parser<string> >
+static cl::opt<PluginLoader, false, cl::parser<std::string> >
 LoadOpt("load", cl::ZeroOrMore, cl::value_desc("plugin.so"),
         cl::desc("Load the specified plugin"));