From 584f3602038919957f62848a03deb5b5bd9cc9ba Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 20 Apr 2011 10:14:10 +0200
Subject: Cosmetic changes

---
 odb/context.cxx                   |  2 +-
 odb/context.hxx                   |  8 ++++----
 odb/relational/type-processor.cxx | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'odb')

diff --git a/odb/context.cxx b/odb/context.cxx
index e2096d9..31f0865 100644
--- a/odb/context.cxx
+++ b/odb/context.cxx
@@ -171,7 +171,7 @@ member_type (semantics::data_member& m, string const& key_prefix)
   if (key_prefix.empty ())
     return m.type ();
 
-  string const key ("tree-" + key_prefix + "-type");
+  string const key (key_prefix + "-tree-type");
 
   if (m.count (key))
     return *indirect_value<semantics::type*> (m, key);
diff --git a/odb/context.hxx b/odb/context.hxx
index 3461da2..f08878d 100644
--- a/odb/context.hxx
+++ b/odb/context.hxx
@@ -249,25 +249,25 @@ public:
   static semantics::type&
   container_idt (semantics::type& c)
   {
-    return *c.get<semantics::type*> ("tree-id-type");
+    return *c.get<semantics::type*> ("id-tree-type");
   }
 
   static semantics::type&
   container_vt (semantics::type& c)
   {
-    return *c.get<semantics::type*> ("tree-value-type");
+    return *c.get<semantics::type*> ("value-tree-type");
   }
 
   static semantics::type&
   container_it (semantics::type& c)
   {
-    return *c.get<semantics::type*> ("tree-index-type");
+    return *c.get<semantics::type*> ("index-tree-type");
   }
 
   static semantics::type&
   container_kt (semantics::type& c)
   {
-    return *c.get<semantics::type*> ("tree-key-type");
+    return *c.get<semantics::type*> ("key-tree-type");
   }
 
   static bool
diff --git a/odb/relational/type-processor.cxx b/odb/relational/type-processor.cxx
index 05c50a5..379c4aa 100644
--- a/odb/relational/type-processor.cxx
+++ b/odb/relational/type-processor.cxx
@@ -270,13 +270,13 @@ namespace relational
         if (t.count ("container"))
         {
           ck = t.get<container_kind_type> ("container-kind");
-          vt = t.get<semantics::type*> ("tree-value-type");
+          vt = t.get<semantics::type*> ("value-tree-type");
 
           if (ck == ck_ordered)
-            it = t.get<semantics::type*> ("tree-index-type");
+            it = t.get<semantics::type*> ("index-tree-type");
 
           if (ck == ck_map || ck == ck_multimap)
-            kt = t.get<semantics::type*> ("tree-key-type");
+            kt = t.get<semantics::type*> ("key-tree-type");
         }
         else
         {
@@ -367,7 +367,7 @@ namespace relational
             throw;
           }
 
-          t.set ("tree-value-type", vt);
+          t.set ("value-tree-type", vt);
 
 
           // Get the index type for ordered containers.
@@ -396,7 +396,7 @@ namespace relational
               throw;
             }
 
-            t.set ("tree-index-type", it);
+            t.set ("index-tree-type", it);
           }
 
           // Get the key type for maps.
@@ -425,13 +425,13 @@ namespace relational
               throw;
             }
 
-            t.set ("tree-key-type", kt);
+            t.set ("key-tree-type", kt);
           }
         }
 
         // Process member data.
         //
-        m.set ("tree-id-type", &id_tree_type);
+        m.set ("id-tree-type", &id_tree_type);
         m.set ("id-column-type", &id_column_type);
 
         process_container_value (*vt, m, "value", true);
-- 
cgit v1.1