diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-27 17:37:10 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-27 17:37:10 +0200 |
commit | ebe76d1f33c45476adc0ad86fad25f32662bd7f4 (patch) | |
tree | 7758eb0f78e564e9aa75c24664344d92eb8c5158 /odb/common-query.hxx | |
parent | 590e3234f887f7ff0c95ca2950088fde48103495 (diff) |
Fix member name conflicts in query support
Diffstat (limited to 'odb/common-query.hxx')
-rw-r--r-- | odb/common-query.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/odb/common-query.hxx b/odb/common-query.hxx index 7404bc0..3bd2560 100644 --- a/odb/common-query.hxx +++ b/odb/common-query.hxx @@ -20,6 +20,9 @@ struct query_utils: virtual context string const& type, // Object fq-type. string const& alias, // Table alias. semantics::class_&); // Traverse for nested structs. + + static string + depth_suffix (size_t); }; // Generate query tags for pointers in this object. @@ -28,7 +31,7 @@ struct query_tags: object_columns_base, virtual context { typedef query_tags base; - query_tags (): nl_ (false) {} + query_tags (): nl_ (false), depth_ (0) {} virtual void traverse (semantics::class_&); @@ -47,6 +50,7 @@ struct query_tags: object_columns_base, virtual context private: bool nl_; + size_t depth_; }; // Generate alias_traits specializations for pointers in this objects. @@ -81,6 +85,7 @@ struct query_alias_traits: object_columns_base, virtual context protected: bool decl_; string scope_; + size_t depth_; }; // Generate query columns in the query_columns_base class. @@ -111,6 +116,7 @@ protected: bool inst_; string const_; // Const prefix or empty. string scope_; + size_t depth_; }; // Generate query columns in the query_columns or pointer_query_columns @@ -143,9 +149,6 @@ struct query_columns: object_columns_base, virtual context virtual void traverse_pointer (semantics::data_member&, semantics::class_&); - static string - depth_suffix (size_t); - protected: bool decl_; bool ptr_; |