From 994cf97b5975fa34b2505362c7ba1362e3f58deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Matar=C3=A9?= Date: Fri, 11 Nov 2016 06:29:41 +0100 Subject: [PATCH] Remove const from as_if::operator()() return (#425) Returning a const value prevents the use of non-copyable return types such as unique_ptr. --- include/yaml-cpp/node/impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h index 50af6b6..20c487a 100644 --- a/include/yaml-cpp/node/impl.h +++ b/include/yaml-cpp/node/impl.h @@ -103,7 +103,7 @@ struct as_if { explicit as_if(const Node& node_) : node(node_) {} const Node& node; - const std::string operator()(const S& fallback) const { + std::string operator()(const S& fallback) const { if (node.Type() != NodeType::Scalar) return fallback; return node.Scalar(); @@ -115,7 +115,7 @@ struct as_if { explicit as_if(const Node& node_) : node(node_) {} const Node& node; - const T operator()() const { + T operator()() const { if (!node.m_pNode) throw TypedBadConversion(node.Mark()); @@ -131,7 +131,7 @@ struct as_if { explicit as_if(const Node& node_) : node(node_) {} const Node& node; - const std::string operator()() const { + std::string operator()() const { if (node.Type() != NodeType::Scalar) throw TypedBadConversion(node.Mark()); return node.Scalar();