From 3191b2b32a96e1a6ee833fcca73e5c8e0c67ba65 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 27 May 2015 18:47:56 +0000 Subject: Vendor import of clang trunk r238337: https://llvm.org/svn/llvm-project/cfe/trunk@238337 --- unittests/Driver/MultilibTest.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'unittests/Driver/MultilibTest.cpp') diff --git a/unittests/Driver/MultilibTest.cpp b/unittests/Driver/MultilibTest.cpp index dceace5..c5e8e09 100644 --- a/unittests/Driver/MultilibTest.cpp +++ b/unittests/Driver/MultilibTest.cpp @@ -254,12 +254,6 @@ TEST(MultilibTest, SetRegexFilter) { } TEST(MultilibTest, SetFilterObject) { - // Filter object - struct StartsWithP : public MultilibSet::FilterCallback { - bool operator()(const Multilib &M) const override { - return StringRef(M.gccSuffix()).startswith("/p"); - } - }; MultilibSet MS; MS.Maybe(Multilib("orange")); MS.Maybe(Multilib("pear")); @@ -273,7 +267,9 @@ TEST(MultilibTest, SetFilterObject) { 1 /* orange/plum */ + 1 /* orange/pear/plum */ ) << "Size before filter was incorrect. Contents:\n" << MS; - MS.FilterOut(StartsWithP()); + MS.FilterOut([](const Multilib &M) { + return StringRef(M.gccSuffix()).startswith("/p"); + }); ASSERT_EQ((int)MS.size(), 1 /* Default */ + 1 /* orange */ + 1 /* orange/pear */ + -- cgit v1.1