From 0801d7b2a5a7114e687a9fbef68c8ebe78a274c9 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Sun, 22 Mar 2015 16:05:46 +0000 Subject: [PATCH] Update unit test for r232916. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@232918 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Driver/MultilibTest.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/unittests/Driver/MultilibTest.cpp b/unittests/Driver/MultilibTest.cpp index dceace536f..c5e8e0970d 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 */ + -- 2.40.0