[llvm-commits] CVS: llvm/tools/llvm-dis/llvm-dis.cpp

[Brian Gaeke]

Changes in directory llvm/tools/llvm-dis:

llvm-dis.cpp updated: 1.35 -> 1.36

---
Log message:

Put all LLVM code into the llvm namespace, as per bug 109.

---
Diffs of the changes:  (+6 -4)

Index: llvm/tools/llvm-dis/llvm-dis.cpp
diff -u llvm/tools/llvm-dis/llvm-dis.cpp:1.35 llvm/tools/llvm-dis/llvm-dis.cpp:1.36
--- llvm/tools/llvm-dis/llvm-dis.cpp:1.35	Mon Oct 20 12:53:02 2003
+++ llvm/tools/llvm-dis/llvm-dis.cpp	Tue Nov 11 16:41:34 2003
@@ -29,10 +29,12 @@
 
 // OutputMode - The different orderings to print basic blocks in...
 enum OutputMode {
-  llvm = 0,           // Generate LLVM assembly (the default)
+  LLVM = 0,           // Generate LLVM assembly (the default)
   c,                  // Generate C code
 };
 
+using namespace llvm;
+
 static cl::opt<std::string>
 InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-"));
 
@@ -45,8 +47,8 @@
 
 static cl::opt<enum OutputMode>
 WriteMode(cl::desc("Specify the output format:"),
-          cl::values(clEnumVal(llvm, "Output LLVM assembly"),
-                     clEnumVal(c   , "Output C code for program"),
+          cl::values(clEnumVal(LLVM, "Output LLVM assembly"),
+                     clEnumVal(c, "Output C code for program"),
                     0));
 
 int main(int argc, char **argv) {
@@ -116,7 +118,7 @@
   PassManager Passes;
 
   switch (WriteMode) {
-  case llvm:           // Output LLVM assembly
+  case LLVM:           // Output LLVM assembly
     Passes.add(new PrintModulePass(Out));
     break;
   case c:              // Convert LLVM to C