aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/yaml-cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-11-11 11:37:33 +0200
committerOrgad Shaneh <orgads@gmail.com>2020-11-12 14:01:10 +0000
commitd0df1527a67fff05a4bc6553a980d8f144661668 (patch)
tree4bef3be77de58210571a942b71b6cb8a811c0e39 /src/libs/3rdparty/yaml-cpp
parent767db9a92b47594701f460c1337e16c6c9c0d827 (diff)
yaml-cpp: Fix/suppress MSVC warnings
* C4251: 'YAML::Binary::m_data': class 'std::vector<unsigned char,std::allocator<unsigned char>>' needs to have dll-interface to be used by clients of class 'YAML::Binary' * C4275: non dll-interface class 'std::runtime_error' used as base for dll-interface class 'YAML::Exception' * STL4015: The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17. Change-Id: I37e32df84ee2d2946181aad790dabd0c3ed58c08 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/libs/3rdparty/yaml-cpp')
-rw-r--r--src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/iterator.h9
-rw-r--r--src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h11
2 files changed, 12 insertions, 8 deletions
diff --git a/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/iterator.h b/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/iterator.h
index deec8fb62c..0ea3bc3f0e 100644
--- a/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/iterator.h
+++ b/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/iterator.h
@@ -19,8 +19,7 @@ namespace detail {
struct iterator_value;
template <typename V>
-class iterator_base : public std::iterator<std::forward_iterator_tag, V,
- std::ptrdiff_t, V*, V> {
+class iterator_base {
private:
template <typename>
@@ -37,7 +36,11 @@ class iterator_base : public std::iterator<std::forward_iterator_tag, V,
};
public:
- typedef typename iterator_base::value_type value_type;
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = V;
+ using difference_type = std::ptrdiff_t;
+ using pointer = V*;
+ using reference = V&;
public:
iterator_base() : m_iterator(), m_pMemory() {}
diff --git a/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h b/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h
index 088090fe74..692afca328 100644
--- a/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h
+++ b/src/libs/3rdparty/yaml-cpp/include/yaml-cpp/node/detail/node_iterator.h
@@ -52,10 +52,7 @@ struct node_iterator_type<const V> {
};
template <typename V>
-class node_iterator_base
- : public std::iterator<std::forward_iterator_tag, node_iterator_value<V>,
- std::ptrdiff_t, node_iterator_value<V>*,
- node_iterator_value<V>> {
+class node_iterator_base {
private:
struct enabler {};
@@ -70,7 +67,11 @@ class node_iterator_base
public:
typedef typename node_iterator_type<V>::seq SeqIter;
typedef typename node_iterator_type<V>::map MapIter;
- typedef node_iterator_value<V> value_type;
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = node_iterator_value<V>;
+ using difference_type = std::ptrdiff_t;
+ using pointer = node_iterator_value<V>*;
+ using reference = node_iterator_value<V>&;
node_iterator_base()
: m_type(iterator_type::NoneType), m_seqIt(), m_mapIt(), m_mapEnd() {}