From 1a4a5134f848404cb6ade9ae384704cea1c95742 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 6 Sep 2013 08:58:56 +0200 Subject: Rename flags for clarity --- odb/context.hxx | 5 ++--- odb/processor.cxx | 6 ++++-- odb/relational/source.cxx | 9 ++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/odb/context.hxx b/odb/context.hxx index 9e7ac0a..416c7c6 100644 --- a/odb/context.hxx +++ b/odb/context.hxx @@ -493,11 +493,10 @@ struct user_sections: std::list static unsigned short const count_versioned_only = 0x40; - // Count all sections, including special. + // Count all sections, but excluding special. // static unsigned short const count_all = count_update | - count_update_empty | - count_special_version; + count_update_empty; static unsigned short const count_new = 0x1000; static unsigned short const count_override = 0x2000; diff --git a/odb/processor.cxx b/odb/processor.cxx index adf1b87..65ee64f 100644 --- a/odb/processor.cxx +++ b/odb/processor.cxx @@ -672,7 +672,8 @@ namespace } size_t n (uss.count (user_sections::count_total | - user_sections::count_all)); + user_sections::count_all | + user_sections::count_special_version)); user_section us (m, c, n, l, u); // We may already have seen this section (e.g., forward reference @@ -2236,7 +2237,8 @@ namespace user_section (*opt, c, uss.count (user_sections::count_total | - user_sections::count_all), + user_sections::count_all | + user_sections::count_special_version), user_section::load_lazy, user_section::update_manual, user_section::special_version)); diff --git a/odb/relational/source.cxx b/odb/relational/source.cxx index 93b1035..796fc13 100644 --- a/odb/relational/source.cxx +++ b/odb/relational/source.cxx @@ -562,7 +562,8 @@ traverse_object (type& c) << "{"; for (size_t i (0), n (uss.count (user_sections::count_total | - user_sections::count_all)); + user_sections::count_all | + user_sections::count_special_version)); i != n; ++i) { os << (i != 0 ? "," : "") << "{"; @@ -1140,8 +1141,7 @@ traverse_object (type& c) if (versioned || persist_versioned_containers || uss.count (user_sections::count_new | - user_sections::count_update | - user_sections::count_update_empty | + user_sections::count_all | user_sections::count_versioned_only) != 0) os << "const schema_version_migration& svm (" << "db.schema_version_migration (" << schema_name << "));"; @@ -3392,8 +3392,7 @@ traverse_object (type& c) if (!versioned && ( load_versioned_containers || uss.count (user_sections::count_new | - user_sections::count_load | - user_sections::count_load_empty | + user_sections::count_all | user_sections::count_versioned_only) != 0)) { os << "const schema_version_migration& svm (" << endl -- cgit v1.1