summaryrefslogtreecommitdiffstats
path: root/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
diff options
context:
space:
mode:
authorAaron Ballman <aaron@aaronballman.com>2016-02-01 14:11:47 +0000
committerAaron Ballman <aaron@aaronballman.com>2016-02-01 14:11:47 +0000
commit7e7b7b2def1fa3efb55a7af294a92a4723263f77 (patch)
tree3f70e41c0fe18c804e17396510beac709033cb5b /clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
parent8bbce8ad8e395796d2f7c0ff0e166e71cb2b88cd (diff)
downloadbcm5719-llvm-7e7b7b2def1fa3efb55a7af294a92a4723263f77.tar.gz
bcm5719-llvm-7e7b7b2def1fa3efb55a7af294a92a4723263f77.zip
Reapply r259210 with a fix for RegistryTest.cpp.
Patch by Richard Thomson. llvm-svn: 259359
Diffstat (limited to 'clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp')
-rw-r--r--clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp b/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
index a1b6a93456d..3b0bd51ec91 100644
--- a/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
+++ b/clang/unittests/ASTMatchers/Dynamic/RegistryTest.cpp
@@ -421,7 +421,7 @@ TEST_F(RegistryTest, Errors) {
constructMatcher("parameterCountIs", 3), Error.get())
.isNull());
EXPECT_EQ("Incorrect type for arg 2. (Expected = Matcher<CXXRecordDecl>) != "
- "(Actual = Matcher<FunctionDecl>)",
+ "(Actual = Matcher<FunctionDecl|FunctionProtoType>)",
Error->toString());
// Bad argument type with variadic.
OpenPOWER on IntegriCloud