15 files changed, 30 insertions, 26 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index 2216ec61afa..857e276f8ca 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -1897,7 +1897,7 @@ private:
   void EnqueueChildren(const Stmt *S);
   void EnqueueChildren(const OMPClause *S);
 };
-} // end anonyous namespace
+} // namespace
 
 void EnqueueVisitor::AddDeclarationNameInfo(const Stmt *S) {
   // 'S' should always be non-null, since it comes from the
@@ -2098,7 +2098,7 @@ OMPClauseEnqueue::VisitOMPCopyprivateClause(const OMPCopyprivateClause *C) {
 void OMPClauseEnqueue::VisitOMPFlushClause(const OMPFlushClause *C) {
   VisitOMPClauseList(C);
 }
-}
+} // namespace
 
 void EnqueueVisitor::EnqueueChildren(const OMPClause *S) {
   unsigned size = WL.size();
@@ -2783,7 +2783,7 @@ buildPieces(unsigned NameFlags, bool IsMemberRefExpr,
 
   return Pieces;  
 }
-}
+} // namespace
 
 //===----------------------------------------------------------------------===//
 // Misc. API hooks.
@@ -5616,7 +5616,7 @@ public:
     assert(PostChildrenInfos.empty());
   }
 };
-}
+} // namespace
 
 void AnnotateTokensWorker::AnnotateTokens() {
   // Walk the AST within the region of interest, annotating tokens
@@ -7116,7 +7116,7 @@ void SetSafetyThreadStackSize(unsigned Value) {
   SafetyStackThreadSize = Value;
 }
 
-}
+} // namespace clang
 
 void clang::setThreadBackgroundPriority() {
   if (getenv("LIBCLANG_BGPRIO_DISABLE"))
diff --git a/clang/tools/libclang/CIndexCodeCompletion.cpp b/clang/tools/libclang/CIndexCodeCompletion.cpp
index a7b8e292047..6637abbf866 100644
--- a/clang/tools/libclang/CIndexCodeCompletion.cpp
+++ b/clang/tools/libclang/CIndexCodeCompletion.cpp
@@ -644,7 +644,7 @@ namespace {
       StoredResults.clear();
     }
   };
-}
+} // namespace
 
 extern "C" {
 struct CodeCompleteAtInfo {
@@ -996,7 +996,7 @@ namespace {
       return result < 0;
     }
   };
-}
+} // namespace
 
 extern "C" {
   void clang_sortCodeCompletionResults(CXCompletionResult *Results,
diff --git a/clang/tools/libclang/CIndexDiagnostic.cpp b/clang/tools/libclang/CIndexDiagnostic.cpp
index 9ba36a6a0f8..24d8af8060c 100644
--- a/clang/tools/libclang/CIndexDiagnostic.cpp
+++ b/clang/tools/libclang/CIndexDiagnostic.cpp
@@ -155,7 +155,7 @@ public:
   CXDiagnosticSetImpl *CurrentSet;
   CXDiagnosticSetImpl *MainSet;
 };  
-}
+} // namespace
 
 CXDiagnosticSetImpl *cxdiag::lazyCreateDiags(CXTranslationUnit TU,
                                              bool checkIfChanged) {
diff --git a/clang/tools/libclang/CIndexer.h b/clang/tools/libclang/CIndexer.h
index 8a306cde67c..3e16f32db7f 100644
--- a/clang/tools/libclang/CIndexer.h
+++ b/clang/tools/libclang/CIndexer.h
@@ -120,7 +120,7 @@ public:
     MacroDefinitionRecord *checkForMacroInMacroDefinition(const MacroInfo *MI,
                                                           const Token &Tok,
                                                           CXTranslationUnit TU);
-    }
-    }
+    } // namespace cxindex
+    } // namespace clang
 
 #endif
diff --git a/clang/tools/libclang/CLog.h b/clang/tools/libclang/CLog.h
index b9309ed1923..6a6e90abea9 100644
--- a/clang/tools/libclang/CLog.h
+++ b/clang/tools/libclang/CLog.h
@@ -87,8 +87,8 @@ public:
   Logger &operator<<(const llvm::format_object_base &Fmt);
 };
 
-}
-}
+} // namespace cxindex
+} // namespace clang
 
 /// \brief Macros to automate common uses of Logger. Like this:
 /// \code
diff --git a/clang/tools/libclang/CXCursor.cpp b/clang/tools/libclang/CXCursor.cpp
index b8bb28ed853..2950451ac3b 100644
--- a/clang/tools/libclang/CXCursor.cpp
+++ b/clang/tools/libclang/CXCursor.cpp
@@ -1249,7 +1249,7 @@ public:
            x.data[1] == y.data[1];
   }
 };
-}
+} // namespace llvm
 
 extern "C" {
 CXCursorSet clang_createCXCursorSet() {
@@ -1325,7 +1325,7 @@ namespace {
       }
     }
   };
-}
+} // namespace
 
 void *cxcursor::createOverridenCXCursorsPool() {
   return new OverridenCursorsPool();
diff --git a/clang/tools/libclang/CXCursor.h b/clang/tools/libclang/CXCursor.h
index 083b86934d1..ec88d53bb7d 100644
--- a/clang/tools/libclang/CXCursor.h
+++ b/clang/tools/libclang/CXCursor.h
@@ -294,6 +294,7 @@ inline bool operator!=(CXCursor X, CXCursor Y) {
 /// first in a declaration group.
 bool isFirstInDeclGroup(CXCursor C);
 
-}} // end namespace: clang::cxcursor
+} // namespace cxcursor
+} // namespace clang
 
 #endif
diff --git a/clang/tools/libclang/CXLoadedDiagnostic.cpp b/clang/tools/libclang/CXLoadedDiagnostic.cpp
index 754ad55a660..746e4579daa 100644
--- a/clang/tools/libclang/CXLoadedDiagnostic.cpp
+++ b/clang/tools/libclang/CXLoadedDiagnostic.cpp
@@ -56,7 +56,7 @@ public:
     return mem;
   }
 };
-}
+} // namespace
 
 //===----------------------------------------------------------------------===//
 // Cleanup.
@@ -246,7 +246,7 @@ public:
 
   CXDiagnosticSet load(const char *file);
 };
-}
+} // namespace
 
 CXDiagnosticSet DiagLoader::load(const char *file) {
   TopDiags = llvm::make_unique<CXLoadedDiagnosticSetImpl>();
diff --git a/clang/tools/libclang/CXLoadedDiagnostic.h b/clang/tools/libclang/CXLoadedDiagnostic.h
index d5006a4444a..b68392783fe 100644
--- a/clang/tools/libclang/CXLoadedDiagnostic.h
+++ b/clang/tools/libclang/CXLoadedDiagnostic.h
@@ -89,6 +89,6 @@ public:
   unsigned severity;
   unsigned category;
 };
-}
+} // namespace clang
 
 #endif
diff --git a/clang/tools/libclang/CXSourceLocation.h b/clang/tools/libclang/CXSourceLocation.h
index f0b3f495491..3cb78d23a1f 100644
--- a/clang/tools/libclang/CXSourceLocation.h
+++ b/clang/tools/libclang/CXSourceLocation.h
@@ -73,6 +73,7 @@ static inline SourceRange translateCXSourceRange(CXSourceRange R) {
 }
 
 
-}} // end namespace: clang::cxloc
+} // namespace cxloc
+} // namespace clang
 
 #endif
diff --git a/clang/tools/libclang/CXString.h b/clang/tools/libclang/CXString.h
index 72ac0cf4691..3d54690ddef 100644
--- a/clang/tools/libclang/CXString.h
+++ b/clang/tools/libclang/CXString.h
@@ -96,12 +96,12 @@ CXStringBuf *getCXStringBuf(CXTranslationUnit TU);
 /// \brief Returns true if the CXString data is managed by a pool.
 bool isManagedByPool(CXString str);
 
-}
+} // namespace cxstring
 
 static inline StringRef getContents(const CXUnsavedFile &UF) {
   return StringRef(UF.Contents, UF.Length);
 }
-}
+} // namespace clang
 
 #endif
 
diff --git a/clang/tools/libclang/CXTranslationUnit.h b/clang/tools/libclang/CXTranslationUnit.h
index 6022c9dab1b..9054c509103 100644
--- a/clang/tools/libclang/CXTranslationUnit.h
+++ b/clang/tools/libclang/CXTranslationUnit.h
@@ -78,6 +78,7 @@ public:
 };
 
 
-}} // end namespace clang::cxtu
+} // namespace cxtu
+} // namespace clang
 
 #endif
diff --git a/clang/tools/libclang/CursorVisitor.h b/clang/tools/libclang/CursorVisitor.h
index 1b2a922204f..a00fc985733 100644
--- a/clang/tools/libclang/CursorVisitor.h
+++ b/clang/tools/libclang/CursorVisitor.h
@@ -263,8 +263,8 @@ public:
   LLVM_ATTRIBUTE_NOINLINE bool Visit(const Stmt *S);
 };
 
-}
-}
+} // namespace cxcursor
+} // namespace clang
 
 #endif
 
diff --git a/clang/tools/libclang/Indexing.cpp b/clang/tools/libclang/Indexing.cpp
index e35640029e6..c1e3378438a 100644
--- a/clang/tools/libclang/Indexing.cpp
+++ b/clang/tools/libclang/Indexing.cpp
@@ -141,7 +141,7 @@ namespace llvm {
       return LHS == RHS;
     }
   };
-}
+} // namespace llvm
 
 namespace {
 
diff --git a/clang/tools/libclang/IndexingContext.h b/clang/tools/libclang/IndexingContext.h
index 4da6aebaf64..5f29e0b4cb8 100644
--- a/clang/tools/libclang/IndexingContext.h
+++ b/clang/tools/libclang/IndexingContext.h
@@ -519,6 +519,7 @@ inline T *ScratchAlloc::allocate() {
   return IdxCtx.StrScratch.Allocate<T>();
 }
 
-}} // end clang::cxindex
+} // namespace cxindex
+} // namespace clang
 
 #endif