From 8e046e3ea7e88f872205c2b65cb7f9b86aaabd93 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 26 Apr 2012 11:29:05 +0200
Subject: Make session optional

---
 odb/relational/header.cxx | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'odb/relational/header.cxx')

diff --git a/odb/relational/header.cxx b/odb/relational/header.cxx
index 46ba722..48bca91 100644
--- a/odb/relational/header.cxx
+++ b/odb/relational/header.cxx
@@ -384,25 +384,31 @@ traverse_object (type& c)
        << "reference_cache_traits;"
        << endl;
   }
-  else if (poly_derived)
-  {
-    os << "typedef" << endl
-       << "odb::pointer_cache_traits<root_traits::pointer_type>" << endl
-       << "pointer_cache_traits;"
-       << "typedef" << endl
-       << "odb::reference_cache_traits<root_type>" << endl
-       << "reference_cache_traits;"
-       << endl;
-  }
   else
   {
-    os << "typedef" << endl
-       << "odb::pointer_cache_traits<pointer_type>" << endl
-       << "pointer_cache_traits;"
-       << "typedef" << endl
-       << "odb::reference_cache_traits<object_type>" << endl
-       << "reference_cache_traits;"
-       << endl;
+    char const* p (session (c) ? "" : "no_op_");
+
+    if (poly_derived)
+    {
+      os << "typedef" << endl
+         << "odb::" << p << "pointer_cache_traits<" <<
+        "root_traits::pointer_type>" << endl
+         << "pointer_cache_traits;"
+         << "typedef" << endl
+         << "odb::" << p << "reference_cache_traits<root_type>" << endl
+         << "reference_cache_traits;"
+         << endl;
+    }
+    else
+    {
+      os << "typedef" << endl
+         << "odb::" << p << "pointer_cache_traits<pointer_type>" << endl
+         << "pointer_cache_traits;"
+         << "typedef" << endl
+         << "odb::" << p << "reference_cache_traits<object_type>" << endl
+         << "reference_cache_traits;"
+         << endl;
+    }
   }
 
   // Statements typedefs.
-- 
cgit v1.1