From 1292650a8f8f7d26a6748728ef814cc20f98542e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= <34161+leolchat@users.noreply.github.com> Date: Sat, 28 Apr 2018 19:51:34 -0700 Subject: [PATCH 1/4] Fix clang error: a space is required between '>>' Full error: a space is required between consecutive right angle brackets (use '> >') --- include/yaml-cpp/exceptions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/yaml-cpp/exceptions.h b/include/yaml-cpp/exceptions.h index 9c96859..364c0c5 100644 --- a/include/yaml-cpp/exceptions.h +++ b/include/yaml-cpp/exceptions.h @@ -97,7 +97,7 @@ const char* const BAD_FILE = "bad file"; template inline const std::string KEY_NOT_FOUND_WITH_KEY( - const T&, typename disable_if>::type* = 0) { + const T&, typename disable_if >::type* = 0) { return KEY_NOT_FOUND; } @@ -109,7 +109,7 @@ inline const std::string KEY_NOT_FOUND_WITH_KEY(const std::string& key) { template inline const std::string KEY_NOT_FOUND_WITH_KEY( - const T& key, typename enable_if>::type* = 0) { + const T& key, typename enable_if >::type* = 0) { std::stringstream stream; stream << KEY_NOT_FOUND << ": " << key; return stream.str(); From 0991734185c3483a8771eb7cd96bb7d9c8a4708c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= <34161+leolchat@users.noreply.github.com> Date: Sat, 28 Apr 2018 19:54:51 -0700 Subject: [PATCH 2/4] Fix node_iterator.h too --- include/yaml-cpp/node/detail/node_iterator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/yaml-cpp/node/detail/node_iterator.h b/include/yaml-cpp/node/detail/node_iterator.h index 088090f..3469ec6 100644 --- a/include/yaml-cpp/node/detail/node_iterator.h +++ b/include/yaml-cpp/node/detail/node_iterator.h @@ -37,7 +37,7 @@ struct node_iterator_value : public std::pair { }; typedef std::vector node_seq; -typedef std::vector> node_map; +typedef std::vector > node_map; template struct node_iterator_type { @@ -55,7 +55,7 @@ template class node_iterator_base : public std::iterator, std::ptrdiff_t, node_iterator_value*, - node_iterator_value> { + node_iterator_value > { private: struct enabler {}; From e5cededa6d24f9d0f8c7a650550edc6800368c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= <34161+leolchat@users.noreply.github.com> Date: Sat, 28 Apr 2018 19:56:21 -0700 Subject: [PATCH 3/4] Fix node_data.h too --- include/yaml-cpp/node/detail/node_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h index 50bcd74..51945fc 100644 --- a/include/yaml-cpp/node/detail/node_data.h +++ b/include/yaml-cpp/node/detail/node_data.h @@ -114,7 +114,7 @@ class YAML_CPP_API node_data { mutable std::size_t m_seqSize; // map - typedef std::vector> node_map; + typedef std::vector > node_map; node_map m_map; typedef std::pair kv_pair; From f9fbdd308502d90ae880016136eeec00164a28e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= <34161+leolchat@users.noreply.github.com> Date: Sat, 28 Apr 2018 19:57:12 -0700 Subject: [PATCH 4/4] Fix convert.h too --- include/yaml-cpp/node/convert.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/yaml-cpp/node/convert.h b/include/yaml-cpp/node/convert.h index 45a878a..2ffd27a 100644 --- a/include/yaml-cpp/node/convert.h +++ b/include/yaml-cpp/node/convert.h @@ -163,7 +163,7 @@ struct convert { // std::map template -struct convert> { +struct convert > { static Node encode(const std::map& rhs) { Node node(NodeType::Map); for (typename std::map::const_iterator it = rhs.begin(); @@ -190,7 +190,7 @@ struct convert> { // std::vector template -struct convert> { +struct convert > { static Node encode(const std::vector& rhs) { Node node(NodeType::Sequence); for (typename std::vector::const_iterator it = rhs.begin(); @@ -217,7 +217,7 @@ struct convert> { // std::list template -struct convert> { +struct convert > { static Node encode(const std::list& rhs) { Node node(NodeType::Sequence); for (typename std::list::const_iterator it = rhs.begin(); @@ -244,7 +244,7 @@ struct convert> { // std::array template -struct convert> { +struct convert > { static Node encode(const std::array& rhs) { Node node(NodeType::Sequence); for (const auto& element : rhs) { @@ -277,7 +277,7 @@ struct convert> { // std::pair template -struct convert> { +struct convert > { static Node encode(const std::pair& rhs) { Node node(NodeType::Sequence); node.push_back(rhs.first);