properly namespacify.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44845 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 10 insertions, 7 deletions

diff --git a/Driver/Targets.cpp b/Driver/Targets.cpp
index a809b94a06..23f8307caa 100644
--- a/Driver/Targets.cpp
+++ b/Driver/Targets.cpp
@@ -299,6 +299,7 @@ static const char* getPPCVAListDeclaration() {
 
 
 /// PPC builtin info.
+namespace clang {
 namespace PPC {
   
   static const Builtin::Info BuiltinInfo[] = {
@@ -404,7 +405,6 @@ namespace PPC {
   
 } // End namespace PPC
 
-
 /// X86 builtin info.
 namespace X86 {
   static const Builtin::Info BuiltinInfo[] = {
@@ -477,6 +477,7 @@ namespace X86 {
   }
   
 } // End namespace X86
+} // end namespace clang.
 
 //===----------------------------------------------------------------------===//
 // Specific target implementations.
diff --git a/include/clang/AST/TargetBuiltins.h b/include/clang/AST/TargetBuiltins.h
index e8b8d04a04..ba107f7cc8 100644
--- a/include/clang/AST/TargetBuiltins.h
+++ b/include/clang/AST/TargetBuiltins.h
@@ -12,24 +12,26 @@
 
 #include "clang/AST/Builtins.h"
 
-/// X86 builtins
-namespace X86 {
+namespace clang {
+  /// X86 builtins
+  namespace X86 {
     enum {
         LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1,
 #define BUILTIN(ID, TYPE, ATTRS) BI##ID,
 #include "X86Builtins.def"
         LastTSBuiltin
     };
-}
+  }
 
-/// PPC builtins
-namespace PPC {
+  /// PPC builtins
+  namespace PPC {
     enum {
         LastTIBuiltin = clang::Builtin::FirstTSBuiltin-1,
 #define BUILTIN(ID, TYPE, ATTRS) BI##ID,
 #include "PPCBuiltins.def"
         LastTSBuiltin
     };
-}
+  }
+} // end namespace clang.
 
 #endif