aboutsummaryrefslogtreecommitdiff
path: root/boost/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-08-24 17:13:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-08-24 17:13:55 +0200
commitff3950866c0f756a5b6f379b9f95f01fff4a9ec7 (patch)
tree1171b1c1ecd9cffc5022d34d8d411846b98adf09 /boost/common
parent1fca8273447e0048941bbfe8ca23466f103c42f3 (diff)
Make tests use unique table prefixes
Diffstat (limited to 'boost/common')
-rw-r--r--boost/common/optional/makefile5
-rw-r--r--boost/common/smart-ptr/makefile3
-rw-r--r--boost/common/template/makefile3
-rw-r--r--boost/common/unordered/makefile3
4 files changed, 9 insertions, 5 deletions
diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile
index 1b4bf2b..6145a2d 100644
--- a/boost/common/optional/makefile
+++ b/boost/common/optional/makefile
@@ -1,4 +1,4 @@
-# file : boost/common/template/makefile
+# file : boost/common/optional/makefile
# author : Boris Kolpackov <boris@codesynthesis.com>
# copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
# license : GNU GPL v2; see accompanying LICENSE file
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/optional --generate-schema --generate-query
+--profile boost/optional --generate-schema --generate-query \
+--table-prefix boost_common_optional_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
$(boost.l.cpp-options)
diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile
index 45983c9..6d875db 100644
--- a/boost/common/smart-ptr/makefile
+++ b/boost/common/smart-ptr/makefile
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/smart-ptr --generate-schema
+--profile boost/smart-ptr --generate-schema \
+--table-prefix boost_common_smart_ptr_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
$(boost.l.cpp-options)
diff --git a/boost/common/template/makefile b/boost/common/template/makefile
index 85000d3..eb2c5f6 100644
--- a/boost/common/template/makefile
+++ b/boost/common/template/makefile
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/version --generate-schema # CHANGE boost/version
+--profile boost/version --generate-schema \
+--table-prefix boost_common_template_ #@@ CHANGE table prefix, boost/version
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
$(boost.l.cpp-options)
diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile
index f52e2a1..0dd69de 100644
--- a/boost/common/unordered/makefile
+++ b/boost/common/unordered/makefile
@@ -45,7 +45,8 @@ gen := $(addprefix $(out_base)/,$(genf))
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): export odb_options += --database $(db_id) \
---profile boost/unordered --generate-schema
+--profile boost/unordered --generate-schema \
+--table-prefix boost_common_unordered_
$(gen): cpp_options := -I$(src_base)
$(gen): $(common.l.cpp-options) $(odb_boost.l.cpp-options) \
$(boost.l.cpp-options)