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

simpler type signature for as_if::operator ()

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

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

@ -13,7 +13,6 @@
#include "yaml-cpp/node/iterator.h" #include "yaml-cpp/node/iterator.h"
#include "yaml-cpp/node/node.h" #include "yaml-cpp/node/node.h"
#include <string> #include <string>
#include <tuple>
#ifdef __cpp_lib_optional #ifdef __cpp_lib_optional
#include <optional> #include <optional>
@ -121,7 +120,7 @@ struct as_if<T, void> {
const Node& node; const Node& node;
template <typename U = T> template <typename U = T>
auto operator()() const -> typename std::tuple_element<1, std::tuple<decltype(&convert<U>::decode), T>>::type { auto operator()() const -> typename std::pair<decltype(&convert<U>::decode), T>::second_type {
if (!node.m_pNode) if (!node.m_pNode)
throw TypedBadConversion<T>(node.Mark()); throw TypedBadConversion<T>(node.Mark());
@ -133,7 +132,7 @@ struct as_if<T, void> {
#ifdef __cpp_lib_optional #ifdef __cpp_lib_optional
template <typename U = T> template <typename U = T>
auto operator()() const -> typename std::tuple_element<1, std::tuple<decltype(&convert<U>::decode_optional), T>>::type { auto operator()() const -> typename std::pair<decltype(&convert<U>::decode_optional), T>::second_type {
if (!node.m_pNode) if (!node.m_pNode)
throw TypedBadConversion<T>(node.Mark()); throw TypedBadConversion<T>(node.Mark());