shrink anon-ns and mark stuff static. No functionality changes

llvm-svn: 30922

1 files changed, 11 insertions, 10 deletions

diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp
index 4a3ccfaa070..cd903126f5b 100644
--- a/llvm/lib/Support/CommandLine.cpp
+++ b/llvm/lib/Support/CommandLine.cpp
@@ -952,23 +952,25 @@ public:
     exit(1);
   }
 };
+} // End anonymous namespace
 
 // Define the two HelpPrinter instances that are used to print out help, or
 // help-hidden...
 //
-HelpPrinter NormalPrinter(false);
-HelpPrinter HiddenPrinter(true);
+static HelpPrinter NormalPrinter(false);
+static HelpPrinter HiddenPrinter(true);
 
-cl::opt<HelpPrinter, true, parser<bool> >
+static cl::opt<HelpPrinter, true, parser<bool> >
 HOp("help", cl::desc("Display available options (--help-hidden for more)"),
     cl::location(NormalPrinter), cl::ValueDisallowed);
 
-cl::opt<HelpPrinter, true, parser<bool> >
+static cl::opt<HelpPrinter, true, parser<bool> >
 HHOp("help-hidden", cl::desc("Display all available options"),
      cl::location(HiddenPrinter), cl::Hidden, cl::ValueDisallowed);
 
-void (*OverrideVersionPrinter)() = 0;
+static void (*OverrideVersionPrinter)() = 0;
 
+namespace {
 class VersionPrinter {
 public:
   void operator=(bool OptionWasSpecified) {
@@ -998,17 +1000,16 @@ public:
     }
   }
 };
+} // End anonymous namespace
 
 
 // Define the --version option that prints out the LLVM version for the tool
-VersionPrinter VersionPrinterInstance;
-cl::opt<VersionPrinter, true, parser<bool> >
+static VersionPrinter VersionPrinterInstance;
+
+static cl::opt<VersionPrinter, true, parser<bool> >
 VersOp("version", cl::desc("Display the version of this program"),
     cl::location(VersionPrinterInstance), cl::ValueDisallowed);
 
-
-} // End anonymous namespace
-
 // Utility function for printing the help message.
 void cl::PrintHelpMessage() {
   // This looks weird, but it actually prints the help message. The