mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
102 lines
3.9 KiB
Diff
102 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: PJ Reiniger <pj.reiniger@gmail.com>
|
|
Date: Sat, 7 May 2022 22:37:34 -0400
|
|
Subject: [PATCH 06/37] Explicitly use std::
|
|
|
|
---
|
|
llvm/include/llvm/ADT/SmallSet.h | 2 +-
|
|
llvm/lib/Support/ErrorHandling.cpp | 2 +-
|
|
llvm/unittests/ADT/SmallPtrSetTest.cpp | 2 +-
|
|
llvm/unittests/ADT/SmallSetTest.cpp | 10 +++++-----
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
|
|
index aeee5f97799aea7e7588d7afba1e47b4fa3d8c7b..4969dfb0d61c2fad805c9cb7bc0184ea6d47bf23 100644
|
|
--- a/llvm/include/llvm/ADT/SmallSet.h
|
|
+++ b/llvm/include/llvm/ADT/SmallSet.h
|
|
@@ -269,7 +269,7 @@ bool operator==(const SmallSet<T, LN, C> &LHS, const SmallSet<T, RN, C> &RHS) {
|
|
return false;
|
|
|
|
// All elements in LHS must also be in RHS
|
|
- return all_of(LHS, [&RHS](const T &E) { return RHS.count(E); });
|
|
+ return std::all_of(LHS.begin(), LHS.end(), [&RHS](const T &E) { return RHS.count(E); });
|
|
}
|
|
|
|
/// Inequality comparison for SmallSet.
|
|
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
|
|
index 89829dc4faff0b2667ded462444e0eaeec53fd01..ea8d60426ead7163550b73e0fdc32cb11bb089cb 100644
|
|
--- a/llvm/lib/Support/ErrorHandling.cpp
|
|
+++ b/llvm/lib/Support/ErrorHandling.cpp
|
|
@@ -249,7 +249,7 @@ std::error_code llvm::mapLastWindowsError() {
|
|
// I'd rather not double the line count of the following.
|
|
#define MAP_ERR_TO_COND(x, y) \
|
|
case x: \
|
|
- return make_error_code(errc::y)
|
|
+ return std::make_error_code(std::errc::y)
|
|
|
|
std::error_code llvm::mapWindowsError(unsigned EV) {
|
|
switch (EV) {
|
|
diff --git a/llvm/unittests/ADT/SmallPtrSetTest.cpp b/llvm/unittests/ADT/SmallPtrSetTest.cpp
|
|
index a39b11b9f82156a78b9ad7ce7b8c28855829e611..a6c2b329f072639706aa221feb8c08e33533f813 100644
|
|
--- a/llvm/unittests/ADT/SmallPtrSetTest.cpp
|
|
+++ b/llvm/unittests/ADT/SmallPtrSetTest.cpp
|
|
@@ -259,7 +259,7 @@ TEST(SmallPtrSetTest, dereferenceAndIterate) {
|
|
|
|
// Sort. We should hit the first element just once and the final element N
|
|
// times.
|
|
- llvm::sort(Found);
|
|
+ std::sort(std::begin(Found), std::end(Found));
|
|
for (auto F = std::begin(Found), E = std::end(Found); F != E; ++F)
|
|
EXPECT_EQ(F - Found + 1, *F);
|
|
}
|
|
diff --git a/llvm/unittests/ADT/SmallSetTest.cpp b/llvm/unittests/ADT/SmallSetTest.cpp
|
|
index b50b368ae663614f050c220432c05b32c201db00..f9d84fa8a42a7feaaffa3aa080e84574dc3671b3 100644
|
|
--- a/llvm/unittests/ADT/SmallSetTest.cpp
|
|
+++ b/llvm/unittests/ADT/SmallSetTest.cpp
|
|
@@ -11,8 +11,8 @@
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/ADT/SmallSet.h"
|
|
-#include "llvm/ADT/STLExtras.h"
|
|
#include "gtest/gtest.h"
|
|
+#include <algorithm>
|
|
#include <string>
|
|
|
|
using namespace llvm;
|
|
@@ -94,7 +94,7 @@ TEST(SmallSetTest, IteratorInt) {
|
|
|
|
std::vector<int> V(s1.begin(), s1.end());
|
|
// Make sure the elements are in the expected order.
|
|
- llvm::sort(V);
|
|
+ std::sort(V.begin(), V.end());
|
|
for (int i = 0; i < 3; i++)
|
|
EXPECT_EQ(i, V[i]);
|
|
|
|
@@ -105,7 +105,7 @@ TEST(SmallSetTest, IteratorInt) {
|
|
|
|
V.assign(s1.begin(), s1.end());
|
|
// Make sure the elements are in the expected order.
|
|
- llvm::sort(V);
|
|
+ std::sort(V.begin(), V.end());
|
|
for (int i = 0; i < 6; i++)
|
|
EXPECT_EQ(i, V[i]);
|
|
}
|
|
@@ -120,7 +120,7 @@ TEST(SmallSetTest, IteratorString) {
|
|
s1.insert("str 1");
|
|
|
|
std::vector<std::string> V(s1.begin(), s1.end());
|
|
- llvm::sort(V);
|
|
+ std::sort(V.begin(), V.end());
|
|
EXPECT_EQ(2u, s1.size());
|
|
EXPECT_EQ("str 1", V[0]);
|
|
EXPECT_EQ("str 2", V[1]);
|
|
@@ -131,7 +131,7 @@ TEST(SmallSetTest, IteratorString) {
|
|
|
|
V.assign(s1.begin(), s1.end());
|
|
// Make sure the elements are in the expected order.
|
|
- llvm::sort(V);
|
|
+ std::sort(V.begin(), V.end());
|
|
EXPECT_EQ(4u, s1.size());
|
|
EXPECT_EQ("str 0", V[0]);
|
|
EXPECT_EQ("str 1", V[1]);
|