From 2a2a9d9efb9209d3b251b62bf347df1dbb8dfae5 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 16 Jul 2012 13:45:31 +0200 Subject: Simplify query inheritance hierarchy This should also allow Sun CC handle queries for objects with circular dependencies. --- odb/relational/inline.hxx | 80 ----------------------------------------------- 1 file changed, 80 deletions(-) (limited to 'odb/relational/inline.hxx') diff --git a/odb/relational/inline.hxx b/odb/relational/inline.hxx index add4741..39801cb 100644 --- a/odb/relational/inline.hxx +++ b/odb/relational/inline.hxx @@ -423,45 +423,6 @@ namespace relational callback_calls_->traverse (c, true); os << "}"; - // query_type - // - if (options.generate_query ()) - { - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type ()" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (bool v)" << endl - << " : query_base_type (v)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const char* q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const std::string& q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const query_base_type& q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - } - // load_() // if (id != 0 && !(poly_derived || has_a (c, test_container))) @@ -569,47 +530,6 @@ namespace relational view_extra (c); - // query_type - // - size_t obj_count (c.get ("object-count")); - - if (obj_count != 0) - { - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type ()" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (bool v)" << endl - << " : query_base_type (v)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const char* q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const std::string& q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - - os << "inline" << endl - << traits << "::query_type::" << endl - << "query_type (const query_base_type& q)" << endl - << " : query_base_type (q)" - << "{" - << "}"; - } - // callback () // os << "inline" << endl -- cgit v1.1