From 90aab2b3d88fb15d56f8872be26dc4e070a5c2ba Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Sun, 26 Jul 2009 08:16:51 +0000 Subject: 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77146 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/MSIL/MSILWriter.cpp | 4 ++-- lib/Target/MSIL/MSILWriter.h | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/Target/MSIL/MSILWriter.cpp b/lib/Target/MSIL/MSILWriter.cpp index ccac518..6e0f3b6 100644 --- a/lib/Target/MSIL/MSILWriter.cpp +++ b/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/lib/Target/MSIL/MSILWriter.h b/lib/Target/MSIL/MSILWriter.h index 21ff359..aa9e075 100644 --- a/lib/Target/MSIL/MSILWriter.h +++ b/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 -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; -- cgit v1.1