llvmc: Cut global namespace pollution.

llvm-svn: 111619

1 files changed, 10 insertions, 7 deletions

diff --git a/llvm/tools/llvmc/examples/mcc16/Hooks.cpp b/llvm/tools/llvmc/examples/mcc16/Hooks.cpp
index aa31c89c8f7..dea97e3ae47 100644
--- a/llvm/tools/llvmc/examples/mcc16/Hooks.cpp
+++ b/llvm/tools/llvmc/examples/mcc16/Hooks.cpp
@@ -4,13 +4,16 @@
 
 #include <string>
 
-using namespace llvm;
-
 namespace llvmc {
   extern char *ProgramName;
+
+  namespace autogenerated {
+    extern llvm::cl::opt<std::string> AutoGeneratedParameter_p;
+  }
 }
 
-extern cl::opt<std::string> AutoGeneratedParameter_p;
+using namespace llvm;
+using namespace llvmc;
 
 // Returns the platform specific directory separator via #ifdefs.
 // FIXME: This currently work on linux and windows only. It does not
@@ -29,10 +32,10 @@ namespace hooks {
 std::string
 GetLowerCasePartDefine(void) {
   std::string Partname;
-  if (AutoGeneratedParameter_p.empty()) {
+  if (autogenerated::AutoGeneratedParameter_p.empty()) {
     Partname = "16f1xxx";
   } else {
-    Partname = AutoGeneratedParameter_p;
+    Partname = autogenerated::AutoGeneratedParameter_p;
   }
 
   std::string LowerCase;
@@ -46,10 +49,10 @@ GetLowerCasePartDefine(void) {
 std::string
 GetUpperCasePartDefine(void) {
   std::string Partname;
-  if (AutoGeneratedParameter_p.empty()) {
+  if (autogenerated::AutoGeneratedParameter_p.empty()) {
     Partname = "16f1xxx";
   } else {
-    Partname = AutoGeneratedParameter_p;
+    Partname = autogenerated::AutoGeneratedParameter_p;
   }
 
   std::string UpperCase;