From a60adf011ea50c60471a9fdea4e7d1cfbf4ddea5 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 15 Oct 2014 22:00:40 +0000 Subject: [PATCH] Avoid having "using namespace" for both "clang" and "llvm" namespaces. This is fragile, as there are classes with the same name in both namespaces (e.g. llvm::Module and clang::Module). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@219855 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Lex/PPCallbacksTest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/unittests/Lex/PPCallbacksTest.cpp b/unittests/Lex/PPCallbacksTest.cpp index af046c4e35..bb27bac6ed 100644 --- a/unittests/Lex/PPCallbacksTest.cpp +++ b/unittests/Lex/PPCallbacksTest.cpp @@ -27,8 +27,6 @@ #include "llvm/Support/Path.h" #include "gtest/gtest.h" -using namespace llvm; -using namespace llvm::sys; using namespace clang; namespace { @@ -142,7 +140,7 @@ protected: FileMgr.getVirtualFile(HeaderPath, 0, 0); // Add header's parent path to search path. - StringRef SearchPath = path::parent_path(HeaderPath); + StringRef SearchPath = llvm::sys::path::parent_path(HeaderPath); const DirectoryEntry *DE = FileMgr.getDirectory(SearchPath); DirectoryLookup DL(DE, SrcMgr::C_User, false); HeaderInfo.AddSearchPath(DL, IsSystemHeader); @@ -160,7 +158,8 @@ protected: // the InclusionDirective callback. CharSourceRange InclusionDirectiveFilenameRange(const char* SourceText, const char* HeaderPath, bool SystemHeader) { - std::unique_ptr Buf = MemoryBuffer::getMemBuffer(SourceText); + std::unique_ptr Buf = + llvm::MemoryBuffer::getMemBuffer(SourceText); SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf))); VoidModuleLoader ModLoader; @@ -197,8 +196,8 @@ protected: LangOptions OpenCLLangOpts; OpenCLLangOpts.OpenCL = 1; - std::unique_ptr SourceBuf = - MemoryBuffer::getMemBuffer(SourceText, "test.cl"); + std::unique_ptr SourceBuf = + llvm::MemoryBuffer::getMemBuffer(SourceText, "test.cl"); SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(SourceBuf))); VoidModuleLoader ModLoader; -- 2.50.1