SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2016-07-21 20:37:04 +00:00
parent a966a0f888
commit 50ebcc160f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cd_utils/cdutils_k_types.cpp
View File

@@ -84,17 +84,14 @@ void KSection::update(KSection & v, bool keep_names) {
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();
for (i = k.begin(); i != k.end(); ++i) { for (i = k.begin(); i != k.end(); ++i) {
bool f = false;
if (keep_names) { if (keep_names) {
if (vk_ids.contains(i.value().name())) { if (vk_ids.contains(i.value().name())) {
k[i.key()].formula_ = vk_ids[i.value().name()]; k[i.key()].formula_ = vk_ids[i.value().name()];
f = true; continue;
} }
} }
if (!f) { 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_;
}
} }
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) {