From 82f6e433acaf46613b0fbb99b14a233a507af46b Mon Sep 17 00:00:00 2001
From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Mon, 9 Mar 2015 17:00:48 +0000
Subject: [PATCH] Roll functions back into namespaces, msvc has problems with
 name lookup outside of it.

llvm-svn: 231671
---
 clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp b/clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp
index cb545d2..f6d3449 100644
--- a/clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp
+++ b/clang/lib/ASTMatchers/Dynamic/Diagnostics.cpp
@@ -8,10 +8,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/ASTMatchers/Dynamic/Diagnostics.h"
-using namespace clang;
-using namespace clang::ast_matchers;
-using namespace clang::ast_matchers::dynamic;
 
+namespace clang {
+namespace ast_matchers {
+namespace dynamic {
 Diagnostics::ArgStream Diagnostics::pushContextFrame(ContextType Type,
                                                      SourceRange Range) {
   ContextStack.push_back(ContextFrame());
@@ -150,7 +150,7 @@ static void formatErrorString(StringRef FormatString,
   }
 }
 
-static void maybeAddLineAndColumn(const dynamic::SourceRange &Range,
+static void maybeAddLineAndColumn(const SourceRange &Range,
                                   llvm::raw_ostream &OS) {
   if (Range.Start.Line > 0 && Range.Start.Column > 0) {
     OS << Range.Start.Line << ":" << Range.Start.Column << ": ";
@@ -216,3 +216,7 @@ std::string Diagnostics::toStringFull() const {
   printToStreamFull(OS);
   return OS.str();
 }
+
+}  // namespace dynamic
+}  // namespace ast_matchers
+}  // namespace clang
-- 
2.7.4