add TemplateName.cpp/h to the xcode project, minor tidying.

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

diff --git a/clang.xcodeproj/project.pbxproj b/clang.xcodeproj/project.pbxproj
index 18b621652840e3a6099b02c0a007212ba79f32b6..62c8d4e90cee2f8c3c0b1f1bd5b5907d8ccf9401 100644 (file)
--- a/clang.xcodeproj/project.pbxproj
+++ b/clang.xcodeproj/project.pbxproj
@@ -233,6 +233,7 @@
                DEDFE6660F7B3B830035BD10 /* Tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEDFE6570F7B3B830035BD10 /* Tool.cpp */; };
                DEDFE6670F7B3B830035BD10 /* HostInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEDFE6580F7B3B830035BD10 /* HostInfo.cpp */; };
                DEDFE6680F7B3B830035BD10 /* Driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEDFE6590F7B3B830035BD10 /* Driver.cpp */; };
+               DEDFF8880F848CF80035BD10 /* TemplateName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEDFF8870F848CF80035BD10 /* TemplateName.cpp */; };
                DEEBBD440C19C5D200A9FE82 /* TODO.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEEBBD430C19C5D200A9FE82 /* TODO.txt */; };
                DEEBC3BA0C2363B800A9FE82 /* CodeGenTypes.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = DEEBC3B90C2363B800A9FE82 /* CodeGenTypes.h */; };
                DEEBC3BC0C2363BC00A9FE82 /* CodeGenTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DEEBC3BB0C2363BC00A9FE82 /* CodeGenTypes.cpp */; };
@@ -636,6 +637,8 @@
                DEDFE6570F7B3B830035BD10 /* Tool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tool.cpp; path = lib/Driver/Tool.cpp; sourceTree = "<group>"; };
                DEDFE6580F7B3B830035BD10 /* HostInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HostInfo.cpp; path = lib/Driver/HostInfo.cpp; sourceTree = "<group>"; };
                DEDFE6590F7B3B830035BD10 /* Driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Driver.cpp; path = lib/Driver/Driver.cpp; sourceTree = "<group>"; };
+               DEDFF87F0F848CE30035BD10 /* TemplateName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TemplateName.h; path = clang/AST/TemplateName.h; sourceTree = "<group>"; };
+               DEDFF8870F848CF80035BD10 /* TemplateName.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TemplateName.cpp; path = lib/AST/TemplateName.cpp; sourceTree = "<group>"; };
                DEEBBD430C19C5D200A9FE82 /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO.txt; sourceTree = "<group>"; };
                DEEBC3B90C2363B800A9FE82 /* CodeGenTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = CodeGenTypes.h; path = lib/CodeGen/CodeGenTypes.h; sourceTree = "<group>"; tabWidth = 2; };
                DEEBC3BB0C2363BC00A9FE82 /* CodeGenTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = CodeGenTypes.cpp; path = lib/CodeGen/CodeGenTypes.cpp; sourceTree = "<group>"; tabWidth = 2; };
@@ -1073,6 +1076,7 @@
                                35847BE30CC7DB9000C40FFF /* StmtIterator.h */,
                                35CFFE010CA1CBDD00E6F2BE /* StmtGraphTraits.h */,
                                1A68BC120D0CADDD001A28C8 /* TargetBuiltins.h */,
+                               DEDFF87F0F848CE30035BD10 /* TemplateName.h */,
                                DE3464210B03040900DBC861 /* Type.h */,
                        );
                        name = AST;
@@ -1106,6 +1110,7 @@
                                35847BE40CC7DBAF00C40FFF /* StmtIterator.cpp */,
                                35839B090CDF845F006ED061 /* StmtSerialization.cpp */,
                                35CFFDFF0CA1CBCB00E6F2BE /* StmtViz.cpp */,
+                               DEDFF8870F848CF80035BD10 /* TemplateName.cpp */,
                                DE75EDF00B06880E0020CF81 /* Type.cpp */,
                                35839B0A0CDF845F006ED061 /* TypeSerialization.cpp */,
                        );
@@ -1563,6 +1568,7 @@
                                DEDFE6680F7B3B830035BD10 /* Driver.cpp in Sources */,
                                1A701B640F7C8FE400FEC4D1 /* SemaAccess.cpp in Sources */,
                                906BF4B00F83BA2E001071FA /* ConvertUTF.c in Sources */,
+                               DEDFF8880F848CF80035BD10 /* TemplateName.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/include/clang/AST/TemplateName.h b/include/clang/AST/TemplateName.h
index 8a83108f8cab201958cbb7ed9ee93f48173b8525..76ac8a6f98a645e65fbe6f2ffbba220cd9b77c6c 100644 (file)
--- a/include/clang/AST/TemplateName.h
+++ b/include/clang/AST/TemplateName.h
@@ -16,7 +16,6 @@
 
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/PointerUnion.h"
-#include "llvm/Support/PointerLikeTypeTraits.h"
 
 namespace llvm {
   class raw_ostream;
@@ -232,7 +231,7 @@ public:
   }
 };
 
-}
+} // end namespace clang.
 
 namespace llvm {
 
@@ -252,6 +251,6 @@ public:
   enum { NumLowBitsAvailable = 0 };
 };
 
-}
+} // end namespace llvm.
 
 #endif

diff --git a/lib/AST/TemplateName.cpp b/lib/AST/TemplateName.cpp
index 16b96a01cd9c53aef1f6e4e276a2856b54a288b0..c437e7b929a5ad55e98a444a031d49332c21c7d7 100644 (file)
--- a/lib/AST/TemplateName.cpp
+++ b/lib/AST/TemplateName.cpp
@@ -10,11 +10,11 @@
 //  This file defines the TemplateName interface and subclasses.
 //
 //===----------------------------------------------------------------------===//
+
 #include "clang/AST/TemplateName.h"
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/NestedNameSpecifier.h"
 #include "llvm/Support/raw_ostream.h"
-
 using namespace clang;
 
 TemplateDecl *TemplateName::getAsTemplateDecl() const {