Finally bite the bullet and make the major change: split the clang namespace

out of the llvm namespace.  This makes the clang namespace be a sibling of
llvm instead of being a child.

The good thing about this is that it makes many things unambiguous.  The
bad things is that many things in the llvm namespace (notably data structures
like smallvector) now require an llvm:: qualifier.  IMO, libsystem and libsupport
should be split out of llvm into their own namespace in the future, which will fix
this issue.

llvm-svn: 39659

1 files changed, 5 insertions, 4 deletions

diff --git a/clang/CodeGen/CodeGenModule.h b/clang/CodeGen/CodeGenModule.h
index 7de3bc0e33b..d58f90d2560 100644
--- a/clang/CodeGen/CodeGenModule.h
+++ b/clang/CodeGen/CodeGenModule.h
@@ -16,6 +16,8 @@
 
 namespace llvm {
   class Module;
+}
+
 namespace clang {
   class ASTContext;
   class FunctionDecl;
@@ -26,12 +28,12 @@ namespace CodeGen {
 /// while generating LLVM code.
 class CodeGenModule {
   ASTContext &Context;
-  Module &TheModule;
+  llvm::Module &TheModule;
 public:
-  CodeGenModule(ASTContext &C, Module &M) : Context(C), TheModule(M) {}
+  CodeGenModule(ASTContext &C, llvm::Module &M) : Context(C), TheModule(M) {}
   
   ASTContext &getContext() const { return Context; }
-  Module &getModule() const { return TheModule; }
+  llvm::Module &getModule() const { return TheModule; }
   
   void EmitFunction(FunctionDecl *FD);
   
@@ -39,6 +41,5 @@ public:
 };
 }  // end namespace CodeGen
 }  // end namespace clang
-}  // end namespace llvm
 
 #endif