From 3a1eed21d4d5d0e7f6a9f400420fdc28d7be9b61 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 17 Feb 2012 10:08:18 +0200
Subject: Add support for composite object ids

New pragma id_type (member). New test: common/composite-id. The composite
example has also been updated.
---
 odb/pragma.cxx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'odb/pragma.cxx')

diff --git a/odb/pragma.cxx b/odb/pragma.cxx
index 5149bee..6c92f0f 100644
--- a/odb/pragma.cxx
+++ b/odb/pragma.cxx
@@ -493,18 +493,8 @@ check_spec_decl_type (tree d,
       return false;
     }
   }
-  else if (p == "id_type")
-  {
-    // Id type can only be used for types.
-    //
-    if (!TYPE_P (d))
-    {
-      error (l) << "name '" << name << "' in db pragma " << p << " does "
-                << "not refer to a type" << endl;
-      return false;
-    }
-  }
   else if (p == "type" ||
+           p == "id_type" ||
            p == "value_type" ||
            p == "index_type" ||
            p == "key_type")
@@ -1841,6 +1831,7 @@ handle_pragma_qualifier (cpp_reader* reader, string const& p)
            p == "key_options" ||
            p == "id_options" ||
            p == "type" ||
+           p == "id_type" ||
            p == "value_type" ||
            p == "index_type" ||
            p == "key_type" ||
-- 
cgit v1.1