From 564700ab7c96b671b0c08a37e9a0e50f4b2fc176 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Feb 2012 10:03:19 +0200
Subject: C++11 support (pass --std ODB compiler option in build makefiles)

---
 boost/common/optional/makefile  | 5 +++++
 boost/common/smart-ptr/makefile | 5 +++++
 boost/common/template/makefile  | 5 +++++
 boost/common/unordered/makefile | 5 +++++
 boost/mssql/date-time/makefile  | 5 +++++
 boost/mssql/template/makefile   | 5 +++++
 boost/mysql/date-time/makefile  | 5 +++++
 boost/mysql/template/makefile   | 5 +++++
 boost/oracle/date-time/makefile | 5 +++++
 boost/oracle/template/makefile  | 5 +++++
 boost/pgsql/date-time/makefile  | 5 +++++
 boost/pgsql/template/makefile   | 5 +++++
 boost/sqlite/date-time/makefile | 5 +++++
 boost/sqlite/template/makefile  | 5 +++++
 14 files changed, 70 insertions(+)

(limited to 'boost')

diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile
index 528823a..0b1866d 100644
--- a/boost/common/optional/makefile
+++ b/boost/common/optional/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile
index 8da77eb..920d3b3 100644
--- a/boost/common/smart-ptr/makefile
+++ b/boost/common/smart-ptr/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/common/template/makefile b/boost/common/template/makefile
index 42dd770..363c730 100644
--- a/boost/common/template/makefile
+++ b/boost/common/template/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile
index ed78a2d..30603c6 100644
--- a/boost/common/unordered/makefile
+++ b/boost/common/unordered/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/mssql/date-time/makefile b/boost/mssql/date-time/makefile
index 7713edc..ab68ca6 100644
--- a/boost/mssql/date-time/makefile
+++ b/boost/mssql/date-time/makefile
@@ -110,7 +110,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/mssql/template/makefile b/boost/mssql/template/makefile
index 184a324..19ff1db 100644
--- a/boost/mssql/template/makefile
+++ b/boost/mssql/template/makefile
@@ -105,7 +105,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile
index 9d9449b..7889b7f 100644
--- a/boost/mysql/date-time/makefile
+++ b/boost/mysql/date-time/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/mysql/template/makefile b/boost/mysql/template/makefile
index 875ca60..5ec5934 100644
--- a/boost/mysql/template/makefile
+++ b/boost/mysql/template/makefile
@@ -105,7 +105,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/oracle/date-time/makefile b/boost/oracle/date-time/makefile
index e1916b7..63ad18d 100644
--- a/boost/oracle/date-time/makefile
+++ b/boost/oracle/date-time/makefile
@@ -110,7 +110,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/oracle/template/makefile b/boost/oracle/template/makefile
index 87829d5..c813394 100644
--- a/boost/oracle/template/makefile
+++ b/boost/oracle/template/makefile
@@ -105,7 +105,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/pgsql/date-time/makefile b/boost/pgsql/date-time/makefile
index 4f79151..b1afc76 100644
--- a/boost/pgsql/date-time/makefile
+++ b/boost/pgsql/date-time/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/pgsql/template/makefile b/boost/pgsql/template/makefile
index b97537c..db2426d 100644
--- a/boost/pgsql/template/makefile
+++ b/boost/pgsql/template/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/sqlite/date-time/makefile b/boost/sqlite/date-time/makefile
index 377b0f6..b36f2b7 100644
--- a/boost/sqlite/date-time/makefile
+++ b/boost/sqlite/date-time/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
diff --git a/boost/sqlite/template/makefile b/boost/sqlite/template/makefile
index b4bf588..c57dd91 100644
--- a/boost/sqlite/template/makefile
+++ b/boost/sqlite/template/makefile
@@ -109,7 +109,12 @@ $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/automake.make)
 
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
 $(call include,$(odb_rules))
+endif
+
 $(call include,$(bld_root)/cxx/cxx-d.make)
 $(call include,$(bld_root)/cxx/cxx-o.make)
 $(call include,$(bld_root)/cxx/o-e.make)
-- 
cgit v1.1