mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
79 lines
3.5 KiB
Diff
79 lines
3.5 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 07/29] Explicitly use std::
|
|
|
|
---
|
|
llvm/include/llvm/ADT/SmallSet.h | 2 +-
|
|
llvm/include/llvm/Support/MathExtras.h | 2 +-
|
|
llvm/lib/Support/ErrorHandling.cpp | 2 +-
|
|
llvm/unittests/ADT/SmallPtrSetTest.cpp | 2 +-
|
|
llvm/unittests/ADT/StringMapTest.cpp | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
|
|
index bfe93e997fc896e82a9b96219967f754df82bcfb..403e108fd361d314762acc317ba6dce7226bb6e5 100644
|
|
--- a/llvm/include/llvm/ADT/SmallSet.h
|
|
+++ b/llvm/include/llvm/ADT/SmallSet.h
|
|
@@ -270,7 +270,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/include/llvm/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
|
|
index db9fbc148ae3064faa94a23713d1def3b466e899..da843ef79ff9fd1e2b702763fcdc6f33771bef94 100644
|
|
--- a/llvm/include/llvm/Support/MathExtras.h
|
|
+++ b/llvm/include/llvm/Support/MathExtras.h
|
|
@@ -586,7 +586,7 @@ inline double Log2(double Value) {
|
|
#if defined(__ANDROID_API__) && __ANDROID_API__ < 18
|
|
return __builtin_log(Value) / __builtin_log(2.0);
|
|
#else
|
|
- return log2(Value);
|
|
+ return std::log2(Value);
|
|
#endif
|
|
}
|
|
|
|
diff --git a/llvm/lib/Support/ErrorHandling.cpp b/llvm/lib/Support/ErrorHandling.cpp
|
|
index 89440b5ab872cbeb5e3fbebfa4550e67aea1486b..f80e28e8710817aa19ca7c012a0a4eaecc801c83 100644
|
|
--- a/llvm/lib/Support/ErrorHandling.cpp
|
|
+++ b/llvm/lib/Support/ErrorHandling.cpp
|
|
@@ -210,7 +210,7 @@ void LLVMResetFatalErrorHandler() {
|
|
// 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 6f3c94eed2737d4e35995454ec7d007cedb1235a..531f81ab5b3fc1dcff731230f3cb7649cb90aedf 100644
|
|
--- a/llvm/unittests/ADT/SmallPtrSetTest.cpp
|
|
+++ b/llvm/unittests/ADT/SmallPtrSetTest.cpp
|
|
@@ -298,7 +298,7 @@ TEST(SmallPtrSetTest, dereferenceAndIterate) {
|
|
|
|
// Sort. We should hit the first element just once and the final element N
|
|
// times.
|
|
- llvm::sort(std::begin(Found), std::end(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/StringMapTest.cpp b/llvm/unittests/ADT/StringMapTest.cpp
|
|
index 86907ab61a2c24effcef3b88c7849482eadd314d..6d0c0942cdc256a01afbeb1902f53bc9c53198d9 100644
|
|
--- a/llvm/unittests/ADT/StringMapTest.cpp
|
|
+++ b/llvm/unittests/ADT/StringMapTest.cpp
|
|
@@ -329,7 +329,7 @@ TEST_F(StringMapTest, IterMapKeysSmallVector) {
|
|
Map["D"] = 3;
|
|
|
|
auto Keys = to_vector<4>(Map.keys());
|
|
- llvm::sort(Keys);
|
|
+ std::sort(Keys.begin(), Keys.end());
|
|
|
|
SmallVector<std::string_view, 4> Expected = {"A", "B", "C", "D"};
|
|
EXPECT_EQ(Expected, Keys);
|