SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@109 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2016-08-01 11:32:44 +00:00
parent 508506a112
commit 71cfb447ce
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cd_utils/cdutils_k_types.cpp
View File

@@ -103,6 +103,7 @@ void KSection::read(const void * ep) {
void KSection::update(KSection & v, bool keep_names) { void KSection::update(KSection & v, bool keep_names) {
PIMap<PIString, PIString> vk_ids; PIMap<PIString, PIString> vk_ids;
PISet<int> used;
PIMap<int, KType>::iterator i; PIMap<int, KType>::iterator i;
for (i = v.k.begin(); i != v.k.end(); ++i) for (i = v.k.begin(); i != v.k.end(); ++i)
vk_ids[i.value().name()] = i.value().formula(); vk_ids[i.value().name()] = i.value().formula();
@@ -113,13 +114,25 @@ void KSection::update(KSection & v, bool keep_names) {
continue; continue;
} }
} }
if (v.k.contains(i.key())) if (v.k.contains(i.key())) {
k[i.key()].formula_ = v.k[i.key()].formula_; k[i.key()].formula_ = v.k[i.key()].formula_;
used << i.key();
}
} }
for (i = v.k.begin(); i != v.k.end(); ++i) {
if (!used.contains(i.key()))
k[i.key()] = i.value();
}
used.clear();
PIMap<int, KSection>::iterator j; PIMap<int, KSection>::iterator j;
for (j = s.begin(); j != s.end(); ++j) { for (j = s.begin(); j != s.end(); ++j) {
if (v.s.contains(j.key())) if (v.s.contains(j.key()))
j.value().update(v.s[j.key()], keep_names); j.value().update(v.s[j.key()], keep_names);
used << j.key();
}
for (j = v.s.begin(); j != v.s.end(); ++j) {
if (!used.contains(j.key()))
s[j.key()] = j.value();
} }
} }