From 61ff4c0458fa0362e054970efbcc21d66240ccc9 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

---
 common/composite-id/driver.cxx | 2 +-
 common/composite-id/makefile   | 2 +-
 common/composite-id/test.hxx   | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'common/composite-id')

diff --git a/common/composite-id/driver.cxx b/common/composite-id/driver.cxx
index 3ad71ac..2066335 100644
--- a/common/composite-id/driver.cxx
+++ b/common/composite-id/driver.cxx
@@ -10,8 +10,8 @@
 #include <iostream>
 
 #include <odb/database.hxx>
-#include <odb/transaction.hxx>
 #include <odb/session.hxx>
+#include <odb/transaction.hxx>
 
 #include <common/common.hxx>
 
diff --git a/common/composite-id/makefile b/common/composite-id/makefile
index a10dd57..3c91c2d 100644
--- a/common/composite-id/makefile
+++ b/common/composite-id/makefile
@@ -35,7 +35,7 @@ gen  := $(addprefix $(out_base)/,$(genf))
 $(gen): $(odb)
 $(gen): odb := $(odb)
 $(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
---generate-query --table-prefix t_comp_id_
+--generate-query --generate-session --table-prefix t_comp_id_
 $(gen): cpp_options := -I$(src_base)
 $(gen): $(common.l.cpp-options)
 
diff --git a/common/composite-id/test.hxx b/common/composite-id/test.hxx
index 00ea972..512c980 100644
--- a/common/composite-id/test.hxx
+++ b/common/composite-id/test.hxx
@@ -30,8 +30,6 @@ operator== (const scomp& x, const scomp& y)
   return x.str1 == y.str1 && x.str2 == y.str2 && x.str3 == y.str3;
 }
 
-//@@ tmp?
-//
 inline bool
 operator< (const scomp& x, const scomp& y)
 {
@@ -60,8 +58,6 @@ operator== (const ncomp& x, const ncomp& y)
   return x.num1 == y.num1 && x.num2 == y.num2 && x.num3 == y.num3;
 }
 
-//@@ tmp?
-//
 inline bool
 operator< (const ncomp& x, const ncomp& y)
 {
-- 
cgit v1.1