From 50ebcc160fc8d44af30203645933fbacec5ed6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 21 Jul 2016 20:37:04 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@103 a8b55f48-bf90-11e4-a774-851b48703e85 --- cd_utils/cdutils_k_types.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cd_utils/cdutils_k_types.cpp b/cd_utils/cdutils_k_types.cpp index 0f321fe..9d0293d 100644 --- a/cd_utils/cdutils_k_types.cpp +++ b/cd_utils/cdutils_k_types.cpp @@ -84,17 +84,14 @@ void KSection::update(KSection & v, bool keep_names) { for (i = v.k.begin(); i != v.k.end(); ++i) vk_ids[i.value().name()] = i.value().formula(); for (i = k.begin(); i != k.end(); ++i) { - bool f = false; if (keep_names) { if (vk_ids.contains(i.value().name())) { k[i.key()].formula_ = vk_ids[i.value().name()]; - f = true; + continue; } } - if (!f) { - if (v.k.contains(i.key())) - k[i.key()].formula_ = v.k[i.key()].formula_; - } + if (v.k.contains(i.key())) + k[i.key()].formula_ = v.k[i.key()].formula_; } PIMap::iterator j; for (j = s.begin(); j != s.end(); ++j) {