Move MSILModule and MSILWriter into the 'llvm' namespace, instead of the 'MSIL'

namespace which could very well conflict with non-LLVM code.

Also clean up some spacing, remove an extra header.

llvm-svn: 77146

2 files changed, 3 insertions, 8 deletions

diff --git a/llvm/lib/Target/MSIL/MSILWriter.cpp b/llvm/lib/Target/MSIL/MSILWriter.cpp
index ccac5189f31..6e0f3b6d42c 100644
--- a/llvm/lib/Target/MSIL/MSILWriter.cpp
+++ b/llvm/lib/Target/MSIL/MSILWriter.cpp
@@ -26,9 +26,9 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/CodeGen/Passes.h"
-using namespace MSIL;
+using namespace llvm;
 
-namespace {
+namespace llvm {
   // TargetMachine for the MSIL 
   struct VISIBILITY_HIDDEN MSILTarget : public TargetMachine {
     const TargetData DataLayout;       // Calculates type size & alignment
diff --git a/llvm/lib/Target/MSIL/MSILWriter.h b/llvm/lib/Target/MSIL/MSILWriter.h
index 21ff359920a..aa9e07540f9 100644
--- a/llvm/lib/Target/MSIL/MSILWriter.h
+++ b/llvm/lib/Target/MSIL/MSILWriter.h
@@ -27,14 +27,9 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Mangler.h"
-#include <ios>
-using namespace llvm;
 
 namespace llvm {
   extern Target TheMSILTarget;
-}
-
-namespace MSIL {
 
   class MSILModule : public ModulePass {
     Module *ModulePtr;
@@ -60,7 +55,7 @@ namespace MSIL {
 
   };
 
-  class MSILWriter  : public FunctionPass {
+  class MSILWriter : public FunctionPass {
     struct StaticInitializer {
       const Constant* constant;
       uint64_t offset;