From: Matthias Braun <matze@braunis.de>
Date: Wed, 31 Oct 2018 01:30:41 +0000 (+0000)
Subject: Try to fix ambiguities with C++17 headers in unittest
X-Git-Tag: llvmorg-8.0.0-rc1~5395
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=854b1af5a116de410bed231fc4683a4681eeb018;p=platform%2Fupstream%2Fllvm.git

Try to fix ambiguities with C++17 headers in unittest

llvm-svn: 345689
---

diff --git a/llvm/unittests/ADT/STLExtrasTest.cpp b/llvm/unittests/ADT/STLExtrasTest.cpp
index 80e10d071ab5..642dc3f6bdd0 100644
--- a/llvm/unittests/ADT/STLExtrasTest.cpp
+++ b/llvm/unittests/ADT/STLExtrasTest.cpp
@@ -365,6 +365,9 @@ TEST(STLExtrasTest, ADLTest) {
 }
 
 TEST(STLExtrasTest, EmptyTest) {
+  // Try to avoid ambiguities with C++17 headers.
+  using llvm::empty;
+
   std::vector<void*> V;
   EXPECT_TRUE(empty(V));
   V.push_back(nullptr);