aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/composite-id/driver.cxx2
-rw-r--r--common/composite-id/makefile2
-rw-r--r--common/composite-id/test.hxx4
-rw-r--r--common/const-object/driver.cxx2
-rw-r--r--common/const-object/test.hxx2
-rw-r--r--common/inverse/driver.cxx2
-rw-r--r--common/inverse/makefile2
-rw-r--r--common/lazy-ptr/driver.cxx1
-rw-r--r--common/lazy-ptr/makefile2
-rw-r--r--common/polymorphism/driver.cxx1
-rw-r--r--common/polymorphism/test.hxx2
-rw-r--r--common/relationship-query/driver.cxx2
-rw-r--r--common/relationship-query/makefile2
-rw-r--r--common/session/driver.cxx1
-rw-r--r--common/session/makefile2
15 files changed, 14 insertions, 15 deletions
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)
{
diff --git a/common/const-object/driver.cxx b/common/const-object/driver.cxx
index 03a6a68..1bf66d8 100644
--- a/common/const-object/driver.cxx
+++ b/common/const-object/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/const-object/test.hxx b/common/const-object/test.hxx
index 1b8e3c0..feb0040 100644
--- a/common/const-object/test.hxx
+++ b/common/const-object/test.hxx
@@ -8,7 +8,7 @@
#include <memory>
#include <odb/core.hxx>
-#pragma db object pointer (obj1*)
+#pragma db object pointer (obj1*) session
struct obj1
{
obj1 () {}
diff --git a/common/inverse/driver.cxx b/common/inverse/driver.cxx
index cf66276..a88ceee 100644
--- a/common/inverse/driver.cxx
+++ b/common/inverse/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/inverse/makefile b/common/inverse/makefile
index 30bd265..8e3e912 100644
--- a/common/inverse/makefile
+++ b/common/inverse/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_inverse_
+--generate-query --generate-session --table-prefix t_inverse_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
diff --git a/common/lazy-ptr/driver.cxx b/common/lazy-ptr/driver.cxx
index 3be6517..ffe692c 100644
--- a/common/lazy-ptr/driver.cxx
+++ b/common/lazy-ptr/driver.cxx
@@ -11,6 +11,7 @@
#include <iostream>
#include <odb/database.hxx>
+#include <odb/session.hxx>
#include <odb/transaction.hxx>
#include <odb/details/config.hxx> // ODB_CXX11_*
diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile
index 77053e3..f0344c9 100644
--- a/common/lazy-ptr/makefile
+++ b/common/lazy-ptr/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 \
---table-prefix lazy_ptr_
+--generate-session --table-prefix lazy_ptr_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
diff --git a/common/polymorphism/driver.cxx b/common/polymorphism/driver.cxx
index 0c9bf1e..09e3321 100644
--- a/common/polymorphism/driver.cxx
+++ b/common/polymorphism/driver.cxx
@@ -10,6 +10,7 @@
#include <iostream>
#include <odb/database.hxx>
+#include <odb/session.hxx>
#include <odb/transaction.hxx>
#include <common/common.hxx>
diff --git a/common/polymorphism/test.hxx b/common/polymorphism/test.hxx
index 99711b5..d0a6ed5 100644
--- a/common/polymorphism/test.hxx
+++ b/common/polymorphism/test.hxx
@@ -552,7 +552,7 @@ namespace test7
using std::tr1::shared_ptr;
#endif
- #pragma db object polymorphic pointer(shared_ptr)
+ #pragma db object polymorphic pointer(shared_ptr) session
struct root
{
virtual ~root () {}
diff --git a/common/relationship-query/driver.cxx b/common/relationship-query/driver.cxx
index ed96223..94a6141 100644
--- a/common/relationship-query/driver.cxx
+++ b/common/relationship-query/driver.cxx
@@ -9,8 +9,8 @@
#include <cassert>
#include <iostream>
-#include <odb/session.hxx>
#include <odb/database.hxx>
+#include <odb/session.hxx>
#include <odb/transaction.hxx>
#include <common/config.hxx> // HAVE_CXX11, HAVE_TR1_MEMORY
diff --git a/common/relationship-query/makefile b/common/relationship-query/makefile
index 619cf8b..87835ad 100644
--- a/common/relationship-query/makefile
+++ b/common/relationship-query/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 relationship_query_
+--generate-query --generate-session --table-prefix relationship_query_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
diff --git a/common/session/driver.cxx b/common/session/driver.cxx
index d8467c2..232aee6 100644
--- a/common/session/driver.cxx
+++ b/common/session/driver.cxx
@@ -10,6 +10,7 @@
#include <iostream>
#include <odb/database.hxx>
+#include <odb/session.hxx>
#include <odb/transaction.hxx>
#include <common/common.hxx>
diff --git a/common/session/makefile b/common/session/makefile
index 4facdbb..e9edc87 100644
--- a/common/session/makefile
+++ b/common/session/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 \
---table-prefix session_
+--generate-session --table-prefix session_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options)
generated by cgit v1.1 at 2024-11-01 22:41:40 +0000