From fb4ed78bde052502861c913e1853f888ea297d2a Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 29 Nov 2017 18:17:08 -0800 Subject: [PATCH] Fix warning from clang+mingw I suspect this is showing up in this configuration because we're now building with -std=gnu++14, but still using libstdc++. frameworks/base/tools/aapt2/link/ProductFilter_test.cpp:76:24: error: chosen constructor is explicit in copy-initialization ProductFilter filter({}); ^~ prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/include/c++/4.8.3/bits/unordered_set.h:132:7: note: explicit constructor declared here unordered_set(size_type __n = 10, ^ frameworks/base/tools/aapt2/link/Linkers.h:114:58: note: passing argument to parameter 'products' here explicit ProductFilter(std::unordered_set products) : products_(products) { ^ Bug: 69933068 Test: mmma frameworks/base/tools/aapt2 Test: out/host/linux-x86/nativetest[64]/aapt2_tests/aapt2_tests Change-Id: I2133e364dd11f64fd13239125f8a3eff70ebb69c --- tools/aapt2/link/ProductFilter_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/aapt2/link/ProductFilter_test.cpp b/tools/aapt2/link/ProductFilter_test.cpp index 379ad26836e8d..86dd56ad8f5be 100644 --- a/tools/aapt2/link/ProductFilter_test.cpp +++ b/tools/aapt2/link/ProductFilter_test.cpp @@ -73,7 +73,7 @@ TEST(ProductFilterTest, SelectDefaultProduct) { test::ValueBuilder().SetSource(Source("tablet.xml")).Build(), context->GetDiagnostics())); - ProductFilter filter({}); + ProductFilter filter(std::unordered_set{}); ASSERT_TRUE(filter.Consume(context.get(), &table)); EXPECT_NE(nullptr, test::GetValueForConfigAndProduct( @@ -123,7 +123,7 @@ TEST(ProductFilterTest, FailOnMultipleDefaults) { test::ValueBuilder().SetSource(Source("default.xml")).Build(), context->GetDiagnostics())); - ProductFilter filter({}); + ProductFilter filter(std::unordered_set{}); ASSERT_FALSE(filter.Consume(context.get(), &table)); }