Fixed/added namespace ending comments using clang-tidy. NFC

The patch is generated using this command:

  $ tools/extra/clang-tidy/tool/run-clang-tidy.py -fix \
      -checks=-*,llvm-namespace-comment -header-filter='llvm/.*|clang/.*' \
      work/llvm/tools/clang

To reduce churn, not touching namespaces spanning less than 10 lines.

llvm-svn: 240270

clang/examples/PrintFunctionNames/PrintFunctionNames.cpp

@@ -117,7 +117,7 @@ protected:
 
 };
 
-}
+} // namespace
 
 static FrontendPluginRegistry::Add<PrintFunctionNamesAction>
 X("print-fns", "print function names");

clang/include/clang/ARCMigrate/ARCMTActions.h

@@ -70,7 +70,7 @@ protected:
   bool BeginInvocation(CompilerInstance &CI) override;
 };
 
-}
+} // namespace arcmt
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/ASTImporter.h

@@ -290,6 +290,6 @@ namespace clang {
     bool IsStructurallyEquivalent(QualType From, QualType To,
                                   bool Complain = true);
   };
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_AST_ASTIMPORTER_H

clang/include/clang/AST/ASTLambda.h

@@ -75,6 +75,6 @@ inline DeclContext *getLambdaAwareParentOfDeclContext(DeclContext *DC) {
     return DC->getParent();
 }
 
-} // clang
+} // namespace clang
 
 #endif

clang/include/clang/AST/ASTVector.h

@@ -400,5 +400,5 @@ void ASTVector<T>::grow(const ASTContext &C, size_t MinSize) {
   Capacity.setPointer(Begin+NewCapacity);
 }
 
-} // end: clang namespace
+} // namespace clang
 #endif

clang/include/clang/AST/BaseSubobject.h

@@ -82,6 +82,6 @@ template <> struct isPodLike<clang::BaseSubobject> {
   static const bool value = true;
 };
 
-}
+} // namespace llvm
 
 #endif

clang/include/clang/AST/CanonicalType.h

@@ -659,7 +659,7 @@ CanProxy<Type> CanTypeIterator<InputIterator>::operator->() const {
   return CanProxy<Type>(*this);
 }
 
-}
+} // namespace clang
 
 
 #endif

clang/include/clang/AST/DeclAccessPair.h

@@ -59,7 +59,7 @@ public:
   operator NamedDecl*() const { return getDecl(); }
   NamedDecl *operator->() const { return getDecl(); }
 };
-}
+} // namespace clang
 
 // Take a moment to tell SmallVector that DeclAccessPair is POD.
 namespace llvm {

clang/include/clang/AST/DeclBase.h

@@ -54,7 +54,7 @@ class Stmt;
 class StoredDeclsMap;
 class TranslationUnitDecl;
 class UsingDirectiveDecl;
-}
+} // namespace clang
 
 namespace clang {
 
@@ -1799,7 +1799,7 @@ struct cast_convert_decl_context<ToTy, true> {
 };
 
 
-} // end clang.
+} // namespace clang
 
 namespace llvm {
 

clang/include/clang/AST/DeclFriend.h

@@ -242,6 +242,6 @@ inline void CXXRecordDecl::pushFriendDecl(FriendDecl *FD) {
   data().FirstFriend = FD;
 }
   
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/DeclGroup.h

@@ -134,7 +134,7 @@ public:
   }
 };
 
-} // end clang namespace
+} // namespace clang
 
 namespace llvm {
   // DeclGroupRef is "like a pointer", implement PointerLikeTypeTraits.
@@ -151,5 +151,5 @@ namespace llvm {
     }
     enum { NumLowBitsAvailable = 0 };
   };
-}
+} // namespace llvm
 #endif

clang/include/clang/AST/DependentDiagnostic.h

@@ -184,6 +184,6 @@ inline DeclContext::ddiag_range DeclContext::ddiags() const {
   return ddiag_range(ddiag_iterator(Map->FirstDiagnostic), ddiag_iterator());
 }
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/EvaluatedExprVisitor.h

@@ -124,6 +124,6 @@ public:
     EvaluatedExprVisitorBase<make_const_ptr, ImplClass>(Context) { }
 };
 
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_AST_EVALUATEDEXPRVISITOR_H

clang/include/clang/AST/ExternalASTSource.h

@@ -467,7 +467,7 @@ struct PointerLikeTypeTraits<
     NumLowBitsAvailable = PointerLikeTypeTraits<T>::NumLowBitsAvailable - 1
   };
 };
-}
+} // namespace llvm
 
 namespace clang {
 /// \brief Represents a lazily-loaded vector of data.

clang/include/clang/AST/Mangle.h

@@ -240,6 +240,6 @@ public:
   static MicrosoftMangleContext *create(ASTContext &Context,
                                         DiagnosticsEngine &Diags);
 };
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/NestedNameSpecifier.h

@@ -510,6 +510,6 @@ inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
   return DB;
 }
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/OperationKinds.h

@@ -350,6 +350,6 @@ enum ObjCBridgeCastKind {
   OBC_BridgeRetained
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/ParentMap.h

@@ -63,5 +63,5 @@ public:
   }
 };
 
-} // end clang namespace
+} // namespace clang
 #endif

clang/include/clang/AST/Redeclarable.h

@@ -272,6 +272,6 @@ public:
   bool isFirstDecl() const { return getFirstDecl() == this; }
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/Type.h

@@ -67,7 +67,7 @@ namespace llvm {
 
   template <>
   struct isPodLike<clang::QualType> { static const bool value = true; };
-}
+} // namespace llvm
 
 namespace clang {
   class ASTContext;
@@ -1008,7 +1008,7 @@ private:
   static DestructionKind isDestructedTypeImpl(QualType type);
 };
 
-} // end clang.
+} // namespace clang
 
 namespace llvm {
 /// Implement simplify_type for QualType, so that we can dyn_cast from QualType

clang/include/clang/AST/TypeLoc.h

@@ -1952,6 +1952,6 @@ public:
 };
 
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/AST/TypeOrdering.h

@@ -74,6 +74,6 @@ namespace llvm {
       return LHS == RHS;
     }
   };
-}
+} // namespace llvm
 
 #endif

clang/include/clang/AST/VTTBuilder.h

@@ -157,6 +157,6 @@ public:
 
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h

@@ -44,6 +44,6 @@ private:
   void mapReachability(const CFGBlock *Dst);
 };
   
-}
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Analyses/Consumed.h

@@ -260,6 +260,7 @@ namespace consumed {
     /// exactly once.
     void run(AnalysisDeclContext &AC);
   };
-}} // end namespace clang::consumed
+} // namespace consumed
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Analyses/FormatString.h

@@ -393,7 +393,7 @@ public:
   static bool namedTypeToLengthModifier(QualType QT, LengthModifier &LM);
 };
 
-} // end analyze_format_string namespace
+} // namespace analyze_format_string
 
 //===----------------------------------------------------------------------===//
 /// Pieces specific to fprintf format strings.
@@ -529,7 +529,7 @@ public:
   bool hasValidPrecision() const;
   bool hasValidFieldWidth() const;
 };
-}  // end analyze_printf namespace
+} // namespace analyze_printf
 
 //===----------------------------------------------------------------------===//
 /// Pieces specific to fscanf format strings.
@@ -595,7 +595,7 @@ public:
   static ScanfSpecifier Parse(const char *beg, const char *end);
 };
 
-} // end analyze_scanf namespace
+} // namespace analyze_scanf
 
 //===----------------------------------------------------------------------===//
 // Parsing and processing of format strings (both fprintf and fscanf).
@@ -665,6 +665,6 @@ bool ParseScanfString(FormatStringHandler &H,
                       const char *beg, const char *end, const LangOptions &LO,
                       const TargetInfo &Target);
 
-} // end analyze_format_string namespace
+} // namespace analyze_format_string
-} // end clang namespace
+} // namespace clang
 #endif

clang/include/clang/Analysis/Analyses/PostOrderCFGView.h

@@ -109,7 +109,7 @@ public:
   static PostOrderCFGView *create(AnalysisDeclContext &analysisContext);
 };
 
-} // end clang namespace
+} // namespace clang
 
 #endif
 

clang/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h

@@ -40,6 +40,6 @@ private:
   bool Analyzed;
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Analyses/ReachableCode.h

@@ -64,6 +64,7 @@ unsigned ScanReachableFromBlock(const CFGBlock *Start,
 void FindUnreachableCode(AnalysisDeclContext &AC, Preprocessor &PP,
                          Callback &CB);
 
-}} // end namespace clang::reachable_code
+} // namespace reachable_code
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Analyses/ThreadSafety.h

@@ -222,5 +222,6 @@ void threadSafetyCleanup(BeforeSet *Cache);
 /// of access.
 LockKind getLockKindFromAccessKind(AccessKind AK);
 
-}} // end namespace clang::threadSafety
+} // namespace threadSafety
+} // namespace clang
 #endif

clang/include/clang/Analysis/Analyses/ThreadSafetyLogical.h

@@ -100,9 +100,9 @@ bool LExpr::implies(const LExpr *RHS) const {
   return lexpr::implies(this, RHS);
 }
 
-}
+} // namespace lexpr
-}
+} // namespace threadSafety
-}
+} // namespace clang
 
 #endif
 

clang/include/clang/Analysis/Analyses/UninitializedValues.h

@@ -122,5 +122,5 @@ void runUninitializedVariablesAnalysis(const DeclContext &dc, const CFG &cfg,
                                        UninitVariablesHandler &handler,
                                        UninitVariablesAnalysisStats &stats);
 
-}
+} // namespace clang
 #endif

clang/include/clang/Analysis/AnalysisContext.h

@@ -476,5 +476,5 @@ private:
   }
 };
 
-} // end clang namespace
+} // namespace clang
 #endif

clang/include/clang/Analysis/CFG.h

@@ -1109,5 +1109,5 @@ template <> struct GraphTraits<Inverse<const ::clang::CFG*> >
     return F->nodes_end();
   }
 };
-} // end llvm namespace
+} // namespace llvm
 #endif

clang/include/clang/Analysis/CFGStmtMap.h

@@ -48,5 +48,5 @@ public:
   }
 };
 
-} // end clang namespace
+} // namespace clang
 #endif

clang/include/clang/Analysis/CallGraph.h

@@ -166,7 +166,7 @@ public:
   void dump() const;
 };
 
-} // end clang namespace
+} // namespace clang
 
 // Graph traits for iteration, viewing.
 namespace llvm {
@@ -248,6 +248,6 @@ template <> struct GraphTraits<const clang::CallGraph*> :
   }
 };
 
-} // end llvm namespace
+} // namespace llvm
 
 #endif

clang/include/clang/Analysis/CodeInjector.h

@@ -41,6 +41,6 @@ public:
   virtual Stmt *getBody(const FunctionDecl *D) = 0;
   virtual Stmt *getBody(const ObjCMethodDecl *D) = 0;
 };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/DomainSpecific/CocoaConventions.h

@@ -37,6 +37,7 @@ namespace coreFoundation {
   bool followsCreateRule(const FunctionDecl *FD);
 }
 
-}} // end: "clang:ento"
+} // namespace ento
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h

@@ -41,6 +41,6 @@ public:
   /// return.
   bool isImplicitNoReturn(const ObjCMessageExpr *ME);
 };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Analysis/Support/BumpVector.h

@@ -240,5 +240,5 @@ void BumpVector<T>::grow(BumpVectorContext &C, size_t MinSize) {
   Capacity = Begin+NewCapacity;
 }
 
-} // end: clang namespace
+} // namespace clang
 #endif

clang/include/clang/Basic/AddressSpaces.h

@@ -44,8 +44,8 @@ enum ID {
 /// to target-specific ones.
 typedef unsigned Map[Count];
 
-}
+} // namespace LangAS
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Basic/Builtins.h

@@ -189,6 +189,6 @@ private:
               const char *Fmt) const;
 };
 
-}
+} // namespace Builtin
 } // end namespace clang
 #endif

clang/include/clang/Basic/DiagnosticIDs.h

@@ -76,7 +76,7 @@ namespace clang {
       Remark          ///< A diagnostic that indicates normal progress through
                       ///< compilation.
     };
-  }
+  } // namespace diag
 
 class DiagnosticMapping {
   unsigned Severity : 3;

clang/include/clang/Basic/LLVM.h

@@ -47,7 +47,7 @@ namespace llvm {
   class raw_ostream;
   class raw_pwrite_stream;
   // TODO: DenseMap, ...
-}
+} // namespace llvm
 
 
 namespace clang {

clang/include/clang/Basic/OpenMPKinds.h

@@ -117,7 +117,7 @@ bool isOpenMPPrivate(OpenMPClauseKind Kind);
 /// \return true - the clause is a threadprivate clause, otherwise - false.
 bool isOpenMPThreadPrivate(OpenMPClauseKind Kind);
 
-}
+} // namespace clang
 
 #endif
 

clang/include/clang/Basic/OperatorPrecedence.h

@@ -41,7 +41,7 @@ namespace prec {
     Multiplicative  = 13,   // *, /, %
     PointerToMember = 14    // .*, ->*
   };
-}
+} // namespace prec
 
 /// \brief Return the precedence of the specified binary operator token.
 prec::Level getBinOpPrecedence(tok::TokenKind Kind, bool GreaterThanIsOperator,

clang/include/clang/Basic/PlistSupport.h

@@ -113,7 +113,7 @@ inline void EmitRange(raw_ostream &o, const SourceManager &SM,
   EmitLocation(o, SM, R.getEnd(), FM, indent + 1);
   Indent(o, indent) << "</array>\n";
 }
-}
+} // namespace markup
-}
+} // namespace clang
 
 #endif

clang/include/clang/Basic/PrettyStackTrace.h

@@ -33,6 +33,6 @@ namespace clang {
       : SM(sm), Loc(L), Message(Msg) {}
     void print(raw_ostream &OS) const override;
   };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Basic/Sanitizers.h

@@ -44,7 +44,7 @@ enum SanitizerOrdinal : uint64_t {
   const SanitizerMask ID##Group = 1ULL << SO_##ID##Group;
 #include "clang/Basic/Sanitizers.def"
 
-}
+} // namespace SanitizerKind
 
 struct SanitizerSet {
   SanitizerSet();

clang/include/clang/Basic/SourceManager.h

@@ -423,7 +423,7 @@ namespace SrcMgr {
       return E;
     }
   };
-}  // end SrcMgr namespace.
+} // namespace SrcMgr
 
 /// \brief External source of source location entries.
 class ExternalSLocEntrySource {

clang/include/clang/Basic/TemplateKinds.h

@@ -38,7 +38,7 @@ enum TemplateNameKind {
   TNK_Dependent_template_name
 };
 
-}
+} // namespace clang
 #endif
 
 

clang/include/clang/Basic/TypeTraits.h

@@ -94,6 +94,6 @@ namespace clang {
     UETT_AlignOf,
     UETT_VecStep
   };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Basic/Version.h

@@ -77,6 +77,6 @@ namespace clang {
   /// for use in the CPP __VERSION__ macro, which includes the clang version
   /// number, the repository version, and the vendor tag.
   std::string getClangFullCPPVersion();
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_BASIC_VERSION_H

clang/include/clang/Basic/Visibility.h

@@ -136,6 +136,6 @@ public:
     if (withVis) mergeVisibility(other);
   }
 };
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_BASIC_VISIBILITY_H

clang/include/clang/CodeGen/BackendUtil.h

@@ -35,6 +35,6 @@ namespace clang {
                          const TargetOptions &TOpts, const LangOptions &LOpts,
                          StringRef TDesc, llvm::Module *M, BackendAction Action,
                          raw_pwrite_stream *OS);
-}
+} // namespace clang
 
 #endif

clang/include/clang/CodeGen/CodeGenAction.h

@@ -98,6 +98,6 @@ public:
   EmitObjAction(llvm::LLVMContext *_VMContext = nullptr);
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/CodeGen/ModuleBuilder.h

@@ -45,6 +45,6 @@ namespace clang {
                                    const CodeGenOptions &CGO,
                                    llvm::LLVMContext& C,
                                    CoverageSourceInfo *CoverageInfo = nullptr);
-}
+} // namespace clang
 
 #endif

clang/include/clang/Driver/Multilib.h

@@ -168,8 +168,8 @@ private:
 };
 
 raw_ostream &operator<<(raw_ostream &OS, const MultilibSet &MS);
-}
+} // namespace driver
-}
+} // namespace clang
 
 #endif
 

clang/include/clang/Driver/Options.h

@@ -42,10 +42,10 @@ enum ID {
     LastOption
 #undef OPTION
   };
-}
+} // namespace options
 
 llvm::opt::OptTable *createDriverOptTable();
-}
+} // namespace driver
-}
+} // namespace clang
 
 #endif

clang/include/clang/Edit/Commit.h

@@ -142,7 +142,7 @@ private:
   }
 };
 
-}
+} // namespace edit
 
 } // end namespace clang
 

clang/include/clang/Edit/EditedSource.h

@@ -82,7 +82,7 @@ private:
   FileEditsTy::iterator getActionForOffset(FileOffset Offs);
 };
 
-}
+} // namespace edit
 
 } // end namespace clang
 

clang/include/clang/Edit/EditsReceiver.h

@@ -28,7 +28,7 @@ public:
   virtual void remove(CharSourceRange range);
 };
 
-}
+} // namespace edit
 
 } // end namespace clang
 

clang/include/clang/Edit/FileOffset.h

@@ -54,7 +54,7 @@ public:
   }
 };
 
-}
+} // namespace edit
 
 } // end namespace clang
 

clang/include/clang/Edit/Rewriters.h

@@ -34,7 +34,7 @@ bool rewriteToObjCLiteralSyntax(const ObjCMessageExpr *Msg,
 bool rewriteToObjCSubscriptSyntax(const ObjCMessageExpr *Msg,
                                   const NSAPI &NS, Commit &commit);
 
-}
+} // namespace edit
 
 }  // end namespace clang
 

clang/include/clang/Frontend/ASTConsumers.h

@@ -53,6 +53,6 @@ std::unique_ptr<ASTConsumer> CreateASTViewer();
 // to stderr; this is intended for debugging.
 std::unique_ptr<ASTConsumer> CreateDeclContextPrinter();
 
-} // end clang namespace
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/ChainedDiagnosticConsumer.h

@@ -67,6 +67,6 @@ public:
   }
 };
 
-} // end namspace clang
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/CommandLineSourceLoc.h

@@ -51,7 +51,7 @@ public:
   }
 };
 
-}
+} // namespace clang
 
 namespace llvm {
   namespace cl {
@@ -81,7 +81,7 @@ namespace llvm {
 
       return false;
     }
-  }
+  } // namespace cl
-}
+} // namespace llvm
 
 #endif

clang/include/clang/Frontend/DiagnosticRenderer.h

@@ -172,5 +172,5 @@ public:
   virtual void emitNote(SourceLocation Loc, StringRef Message,
                         const SourceManager *SM) = 0;
 };
-} // end clang namespace
+} // namespace clang
 #endif

clang/include/clang/Frontend/FrontendOptions.h

@@ -56,7 +56,7 @@ namespace frontend {
     MigrateSource,          ///< Run migrator.
     RunPreprocessorOnly     ///< Just lex, no output.
   };
-}
+} // namespace frontend
 
 enum InputKind {
   IK_None,

clang/include/clang/Frontend/LangStandard.h

@@ -32,7 +32,7 @@ enum LangFeatures {
   ImplicitInt = (1 << 11)
 };
 
-}
+} // namespace frontend
 
 /// LangStandard - Information about the properties of a particular language
 /// standard.

clang/include/clang/Frontend/LayoutOverrideSource.h

@@ -58,6 +58,6 @@ namespace clang {
     /// \brief Dump the overridden layouts.
     void dump();
   };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/MigratorOptions.h

@@ -27,5 +27,5 @@ public:
   }
 };
 
-}
+} // namespace clang
 #endif

clang/include/clang/Frontend/SerializedDiagnosticPrinter.h

@@ -37,7 +37,7 @@ std::unique_ptr<DiagnosticConsumer> create(StringRef OutputFile,
                                            DiagnosticOptions *Diags,
                                            bool MergeChildRecords = false);
 
-} // end serialized_diags namespace
+} // namespace serialized_diags
-} // end clang namespace
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/SerializedDiagnosticReader.h

@@ -120,8 +120,8 @@ protected:
   };
 };
 
-} // end serialized_diags namespace
+} // namespace serialized_diags
-} // end clang namespace
+} // namespace clang
 
 namespace std {
 template <>

clang/include/clang/Frontend/SerializedDiagnostics.h

@@ -53,7 +53,7 @@ enum Level {
 /// \brief The serialized diagnostics version number.
 enum { VersionNumber = 2 };
 
-} // end serialized_diags namespace
+} // namespace serialized_diags
-} // end clang namespace
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/TextDiagnosticBuffer.h

@@ -50,6 +50,6 @@ public:
   void FlushDiagnostics(DiagnosticsEngine &Diags) const;
 };
 
-} // end namspace clang
+} // namespace clang
 
 #endif

clang/include/clang/Frontend/VerifyDiagnosticConsumer.h

@@ -273,6 +273,6 @@ public:
                         const Diagnostic &Info) override;
 };
 
-} // end namspace clang
+} // namespace clang
 
 #endif

clang/include/clang/Lex/CodeCompletionHandler.h

@@ -66,6 +66,6 @@ public:
   virtual void CodeCompleteNaturalLanguage() { }
 };
   
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_LEX_CODECOMPLETIONHANDLER_H

clang/include/clang/Lex/ExternalPreprocessorSource.h

@@ -38,6 +38,6 @@ public:
   virtual Module *getModule(unsigned ModuleID) = 0;
 };
   
-}
+} // namespace clang
 
 #endif

clang/include/clang/Lex/HeaderSearchOptions.h

@@ -38,7 +38,7 @@ namespace frontend {
     ObjCXXSystem,   ///< Like System, but only used for ObjC++.
     After           ///< Like System, but searched after the system directories.
   };
-}
+} // namespace frontend
 
 /// HeaderSearchOptions - Helper class for storing options related to the
 /// initialization of the HeaderSearch object.

clang/include/clang/Lex/ModuleLoader.h

@@ -124,6 +124,6 @@ public:
   bool HadFatalFailure;
 };
   
-}
+} // namespace clang
 
 #endif

clang/include/clang/Lex/ModuleMap.h

@@ -466,5 +466,5 @@ public:
   module_iterator module_end()   const { return Modules.end(); }
 };
   
-}
+} // namespace clang
 #endif

clang/include/clang/Lex/TokenConcatenation.h

@@ -67,6 +67,6 @@ namespace clang {
     /// is literally 'L', 'u', 'U', or 'u8'.
     bool IsIdentifierStringPrefix(const Token &Tok) const;
   };
-  } // end clang namespace
+  } // namespace clang
 
 #endif

clang/include/clang/Rewrite/Core/HTMLRewrite.h

@@ -75,7 +75,7 @@ namespace html {
   /// reasonably close.
   void HighlightMacros(Rewriter &R, FileID FID, const Preprocessor &PP);
 
-} // end html namespace
+} // namespace html
-} // end clang namespace
+} // namespace clang
 
 #endif

clang/include/clang/Rewrite/Frontend/ASTConsumers.h

@@ -43,6 +43,6 @@ std::unique_ptr<ASTConsumer> CreateHTMLPrinter(raw_ostream *OS,
                                                bool SyntaxHighlight = true,
                                                bool HighlightMacros = true);
 
-} // end clang namespace
+} // namespace clang
 
 #endif

clang/include/clang/Rewrite/Frontend/FixItRewriter.h

@@ -127,6 +127,6 @@ public:
   void Diag(SourceLocation Loc, unsigned DiagID);
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/AnalysisBasedWarnings.h

@@ -98,6 +98,7 @@ public:
   void PrintStats() const;
 };
 
-}} // end namespace clang::sema
+} // namespace sema
+} // namespace clang
 
 #endif

clang/include/clang/Sema/DelayedDiagnostic.h

@@ -291,7 +291,7 @@ public:
   bool pool_empty() const { return Diagnostics.empty(); }
 };
 
-}
+} // namespace sema
 
 /// Add a diagnostic to the current delay pool.
 inline void Sema::DelayedDiagnostics::add(const sema::DelayedDiagnostic &diag) {
@@ -300,6 +300,6 @@ inline void Sema::DelayedDiagnostics::add(const sema::DelayedDiagnostic &diag) {
 }
 
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/Lookup.h

@@ -750,6 +750,6 @@ public:
   iterator end() { return iterator(Decls.end()); }
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/ObjCMethodList.h

@@ -53,6 +53,6 @@ struct ObjCMethodList {
   }
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/Ownership.h

@@ -103,7 +103,7 @@ namespace clang {
       return *this;
     }
   };
-}
+} // namespace clang
 
 namespace llvm {
   template <class T>
@@ -121,7 +121,7 @@ namespace llvm {
 
   template <class T>
   struct isPodLike<clang::OpaquePtr<T> > { static const bool value = true; };
-}
+} // namespace llvm
 
 namespace clang {
   // Basic
@@ -282,6 +282,6 @@ namespace clang {
     assert(!R.isInvalid() && "operation was asserted to never fail!");
     return R.get();
   }
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/ParsedTemplate.h

@@ -209,6 +209,6 @@ namespace clang {
   /// Retrieves the range of the given template parameter lists.
   SourceRange getTemplateParamsRange(TemplateParameterList const *const *Params,
                                      unsigned NumParams);  
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/PrettyDeclStackTrace.h

@@ -42,6 +42,6 @@ public:
   void print(raw_ostream &OS) const override;
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/Sema.h

@@ -198,7 +198,7 @@ namespace sema {
   class LambdaScopeInfo;
   class PossiblyUnreachableDiag;
   class TemplateDeductionInfo;
-}
+} // namespace sema
 
 namespace threadSafety {
   class BeforeSet;

clang/include/clang/Sema/SemaConsumer.h

@@ -43,6 +43,6 @@ namespace clang {
       return Consumer->SemaConsumer;
     }
   };
-}
+} // namespace clang
 
 #endif

clang/include/clang/Sema/SemaFixItUtils.h

@@ -87,5 +87,5 @@ struct ConversionFixItGenerator {
   }
 };
 
-} // endof namespace clang
+} // namespace clang
 #endif

clang/include/clang/Sema/SemaLambda.h

@@ -31,6 +31,6 @@ Optional<unsigned> getStackIndexOfNearestEnclosingCaptureCapableLambda(
     ArrayRef<const sema::FunctionScopeInfo *> FunctionScopes,
     VarDecl *VarToCapture, Sema &S);
 
-} // clang
+} // namespace clang
 
 #endif

clang/include/clang/Sema/Template.h

@@ -513,6 +513,6 @@ namespace clang {
         VarTemplatePartialSpecializationDecl *PartialSpec);
     void InstantiateEnumDefinition(EnumDecl *Enum, EnumDecl *Pattern);
   };  
-}
+} // namespace clang
 
 #endif // LLVM_CLANG_SEMA_TEMPLATE_H

clang/include/clang/Sema/TypoCorrection.h

@@ -355,6 +355,6 @@ public:
   }
 };
 
-}
+} // namespace clang
 
 #endif

clang/include/clang/Serialization/ASTBitCodes.h

@@ -1481,7 +1481,7 @@ namespace clang {
     };
 
     /// @}
-  }
+  } // namespace serialization
 } // end namespace clang
 
 #endif