diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-09-19 22:19:55 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2016-10-06 21:01:10 -0700 |
| commit | 4967a710c84587c654b56c828382219c3937dacb (patch) | |
| tree | ae0d585998e15fc175ca3e9146b21e53f290624b /unittests/Lex/PPConditionalDirectiveRecordTest.cpp | |
| parent | d27d7495bf70da4faffda3d8083396e0e07f2931 (diff) | |
| download | clang-4967a710c84587c654b56c828382219c3937dacb.tar.gz | |
Update aosp/master Clang for rebase to r275480
Bug: http://b/31320715
This merges commit ac9cc4764cf47a6c3f031687d8592e080c9f5001 from
aosp/dev.
Test: Build AOSP and run RenderScript tests (host tests for slang and
libbcc, RsTest, CTS)
Change-Id: Ic2875e5c3673c83448cd7d1013861e42947b1b55
Diffstat (limited to 'unittests/Lex/PPConditionalDirectiveRecordTest.cpp')
| -rw-r--r-- | unittests/Lex/PPConditionalDirectiveRecordTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp index 9345fc2390..bceeac57ea 100644 --- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp +++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp @@ -22,7 +22,6 @@ #include "clang/Lex/PreprocessorOptions.h" #include "gtest/gtest.h" -using namespace llvm; using namespace clang; namespace { @@ -89,7 +88,8 @@ TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) { "#endif\n" "9\n"; - std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(source); + std::unique_ptr<llvm::MemoryBuffer> Buf = + llvm::MemoryBuffer::getMemBuffer(source); SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(Buf))); VoidModuleLoader ModLoader; |