mirror of
https://github.com/monero-project/monero.git
synced 2024-12-25 00:39:25 -05:00
Merge pull request #9548
c1ead13
wallet2_api: use std::optional instead of handmade optional (jeffro256)
This commit is contained in:
commit
318bc17eca
@ -31,14 +31,15 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <set>
|
||||
#include <cstdint>
|
||||
#include <ctime>
|
||||
#include <iostream>
|
||||
#include <list>
|
||||
#include <optional>
|
||||
#include <set>
|
||||
#include <stdexcept>
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
// Public interface for libwallet library
|
||||
namespace Monero {
|
||||
@ -54,18 +55,9 @@ enum NetworkType : uint8_t {
|
||||
void onStartup();
|
||||
}
|
||||
|
||||
// backwards compatible shim for old declaration of handmade optional<> struct
|
||||
template<typename T>
|
||||
class optional {
|
||||
public:
|
||||
optional(): set(false) {}
|
||||
optional(const T &t): t(t), set(true) {}
|
||||
const T &operator*() const { return t; }
|
||||
T &operator*() { return t; }
|
||||
operator bool() const { return set; }
|
||||
private:
|
||||
T t;
|
||||
bool set;
|
||||
};
|
||||
using optional = std::optional<T>;
|
||||
|
||||
/**
|
||||
* @brief Transaction-like interface for sending money
|
||||
|
Loading…
Reference in New Issue
Block a user