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

Merge c5a0158d07 into f74ae543b4

Browse Source
This commit is contained in:
ysyrov 2016-06-13 08:57:08 +00:00 committed by GitHub
commit b5cfdd1044
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/yaml-cpp/node/detail/node_data.h
View File

@ -114,7 +114,7 @@ class YAML_CPP_API node_data {
mutable std::size_t m_seqSize;
// map
typedef std::map<node*, node*> node_map;
typedef std::list<std::pair<node*, node*>> node_map;
node_map m_map;
typedef std::pair<node*, node*> kv_pair;

2
include/yaml-cpp/node/detail/node_iterator.h
View File

@ -37,7 +37,7 @@ struct node_iterator_value : public std::pair<V*, V*> {
};
typedef std::vector<node*> node_seq;
typedef std::map<node*, node*> node_map;
typedef std::list<std::pair<node*, node*>> node_map;
template <typename V>
struct node_iterator_type {

15
src/node_data.cpp
View File

@ -256,9 +256,20 @@ void node_data::reset_map() {
}
void node_data::insert_map_pair(node& key, node& value) {
m_map[&key] = &value;
bool found = false;
for (node_map::iterator it = m_map.begin(); it != m_map.end(); ++it) {
if (it->first == &key) {
it->second = &value;
found = true;
break;
}
}
if (!found)
m_map.emplace_back(&key, &value);
if (!key.is_defined() || !value.is_defined())
m_undefinedPairs.push_back(kv_pair(&key, &value));
m_undefinedPairs.emplace_back(&key, &value);
}
void node_data::convert_to_map(shared_memory_holder pMemory) {