Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wpiutil: Replace LLVM Optional with C++17-compatible optional

Browse Source 
Imported from https://github.com/akrzemi1/Optional with minor changes:
- Compiler conditional simplifications (we only use recent versions)
- Move from std::experimental to wpi namespace
- Change tests to integrate with Google Test

Update LLVM use cases.
This commit is contained in:
Peter Johnson
2018-11-19 22:57:34 -08:00
parent 489701cacc
commit 0b03454366
14 changed files with 2494 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpiutil/src/main/native/include/wpi/SmallSet.h
View File

@@ -14,7 +14,7 @@
#ifndef WPIUTIL_WPI_SMALLSET_H
#define WPIUTIL_WPI_SMALLSET_H
#include "wpi/None.h"
#include "wpi/optional.h"
#include "wpi/SmallPtrSet.h"
#include "wpi/SmallVector.h"
#include "wpi/Compiler.h"
@@ -78,16 +78,16 @@ public:
/// concept.
// FIXME: Add iterators that abstract over the small and large form, and then
// return those here.
std::pair<NoneType, bool> insert(const T &V) {
std::pair<nullopt_t, bool> insert(const T &V) {
if (!isSmall())
return std::make_pair(None, Set.insert(V).second);
return std::make_pair(nullopt, Set.insert(V).second);
VIterator I = vfind(V);
if (I != Vector.end()) // Don't reinsert if it already exists.
return std::make_pair(None, false);
return std::make_pair(nullopt, false);
if (Vector.size() < N) {
Vector.push_back(V);
return std::make_pair(None, true);
return std::make_pair(nullopt, true);
}
// Otherwise, grow from vector to set.
@@ -96,7 +96,7 @@ public:
Vector.pop_back();
}
Set.insert(V);
return std::make_pair(None, true);
return std::make_pair(nullopt, true);
}
template <typename IterT>