External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make use of convert::decode_optional

Browse Source
This commit is contained in:
刺史色笛 2019-03-26 02:48:03 +01:00 committed by GitHub
parent bd7f8c60c8
commit f34639ac84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/yaml-cpp/node/impl.h
View File

@ -13,6 +13,11 @@
#include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/node.h"
#include <string>
#include <tuple>
#ifdef __cpp_lib_optional
#include <optional>
#endif
namespace YAML {
inline Node::Node() : m_isValid(true), m_pMemory(nullptr), m_pNode(nullptr) {}
@ -115,7 +120,8 @@ struct as_if<T, void> {
explicit as_if(const Node& node_) : node(node_) {}
const Node& node;
T operator()() const {
template <typename U = T>
auto operator()() const -> typename std::tuple_element<1, std::tuple<decltype(&convert<U>::decode), T>>::type {
if (!node.m_pNode)
throw TypedBadConversion<T>(node.Mark());
@ -124,6 +130,19 @@ struct as_if<T, void> {
return t;
throw TypedBadConversion<T>(node.Mark());
}
#ifdef __cpp_lib_optional
template <typename U = T>
auto operator()() const -> typename std::tuple_element<1, std::tuple<decltype(&convert<U>::decode_optional), T>>::type {
if (!node.m_pNode)
throw TypedBadConversion<T>(node.Mark());
std::optional<T> t = convert<T>::decode_optional(node);
if (t)
return *t;
throw TypedBadConversion<T>(node.Mark());
}
#endif
};
template <>