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

MatzeB · MatzeB · commit 854b1af5a116 · 2018-10-31T01:30:41.000Z
llvm-svn: 345689
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -365,6 +365,9 @@ TEST(STLExtrasTest, ADLTest) {`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`TEST(STLExtrasTest, EmptyTest) {`
	`368`	`+ // Try to avoid ambiguities with C++17 headers.`
	`369`	`+ using llvm::empty;`
	`370`	`+`
`368`	`371`	`std::vector<void*> V;`
`369`	`372`	`EXPECT_TRUE(empty(V));`
`370`	`373`	`V.push_back(nullptr);`