C++11 support in automake and VC++ projects, portability fixes

56 files changed, 115 insertions, 41 deletions

diff --git a/boost/common/template/Makefile.am b/boost/common/template/Makefile.am
index aab4631..d242a61 100644
--- a/boost/common/template/Makefile.am
+++ b/boost/common/template/Makefile.am
@@ -24,5 +24,9 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options) $<
diff --git a/boost/common/template/template-vc10.vcxproj b/boost/common/template/template-vc10.vcxproj
index 55ceffc..af7987e 100644
--- a/boost/common/template/template-vc10.vcxproj
+++ b/boost/common/template/template-vc10.vcxproj
@@ -158,7 +158,7 @@
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/boost/common/template/template-vc9.vcproj b/boost/common/template/template-vc9.vcproj
index 235bd3c..bf900d0 100644
--- a/boost/common/template/template-vc9.vcproj
+++ b/boost/common/template/template-vc9.vcproj
@@ -348,7 +348,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx)
diff --git a/boost/mssql/template/Makefile.am b/boost/mssql/template/Makefile.am
index 8eb0769..f450bb0 100644
--- a/boost/mssql/template/Makefile.am
+++ b/boost/mssql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/boost/mssql/template/template-vc10.vcxproj b/boost/mssql/template/template-vc10.vcxproj
index a8e32bb..b1e2e37 100644
--- a/boost/mssql/template/template-vc10.vcxproj
+++ b/boost/mssql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/boost/mssql/template/template-vc9.vcproj b/boost/mssql/template/template-vc9.vcproj
index 905f55a..520a143 100644
--- a/boost/mssql/template/template-vc9.vcproj
+++ b/boost/mssql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/boost/mysql/template/Makefile.am b/boost/mysql/template/Makefile.am
index a10f7a0..10e80d3 100644
--- a/boost/mysql/template/Makefile.am
+++ b/boost/mysql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/boost/mysql/template/template-vc10.vcxproj b/boost/mysql/template/template-vc10.vcxproj
index e6475bb..29e53be 100644
--- a/boost/mysql/template/template-vc10.vcxproj
+++ b/boost/mysql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/boost/mysql/template/template-vc9.vcproj b/boost/mysql/template/template-vc9.vcproj
index 316ea86..99551c1 100644
--- a/boost/mysql/template/template-vc9.vcproj
+++ b/boost/mysql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/boost/oracle/template/Makefile.am b/boost/oracle/template/Makefile.am
index da5c150..9853f57 100644
--- a/boost/oracle/template/Makefile.am
+++ b/boost/oracle/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/boost/oracle/template/template-vc10.vcxproj b/boost/oracle/template/template-vc10.vcxproj
index 99773c8..8aa5256 100644
--- a/boost/oracle/template/template-vc10.vcxproj
+++ b/boost/oracle/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/boost/oracle/template/template-vc9.vcproj b/boost/oracle/template/template-vc9.vcproj
index 0342966..2a7448a 100644
--- a/boost/oracle/template/template-vc9.vcproj
+++ b/boost/oracle/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/boost/pgsql/template/Makefile.am b/boost/pgsql/template/Makefile.am
index 94546bc..ec9e43b 100644
--- a/boost/pgsql/template/Makefile.am
+++ b/boost/pgsql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/boost/pgsql/template/template-vc10.vcxproj b/boost/pgsql/template/template-vc10.vcxproj
index b344095..9f41ede 100644
--- a/boost/pgsql/template/template-vc10.vcxproj
+++ b/boost/pgsql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/boost/pgsql/template/template-vc9.vcproj b/boost/pgsql/template/template-vc9.vcproj
index 2639ffb..34a8582 100644
--- a/boost/pgsql/template/template-vc9.vcproj
+++ b/boost/pgsql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/boost/sqlite/template/Makefile.am b/boost/sqlite/template/Makefile.am
index f03a875..0168a12 100644
--- a/boost/sqlite/template/Makefile.am
+++ b/boost/sqlite/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/boost/sqlite/template/template-vc10.vcxproj b/boost/sqlite/template/template-vc10.vcxproj
index 14e3fb8..5224c7f 100644
--- a/boost/sqlite/template/template-vc10.vcxproj
+++ b/boost/sqlite/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/boost/sqlite/template/template-vc9.vcproj b/boost/sqlite/template/template-vc9.vcproj
index b8fab03..93e9ba2 100644
--- a/boost/sqlite/template/template-vc9.vcproj
+++ b/boost/sqlite/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/common/lazy-ptr/driver.cxx b/common/lazy-ptr/driver.cxx
index 2e2f140..3be6517 100644
--- a/common/lazy-ptr/driver.cxx
+++ b/common/lazy-ptr/driver.cxx
@@ -12,6 +12,7 @@
 
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
+#include <odb/details/config.hxx> // ODB_CXX11_*
 
 #include <common/common.hxx>
 
@@ -116,7 +117,7 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#ifdef HAVE_CXX11
+#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o[0].object_id () == o->id);
         assert (o->c.object_id () == c->id);
 #else
@@ -196,7 +197,7 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#ifdef HAVE_CXX11
+#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o.object_id () == o->id);
         assert (o->c.object_id () == c->id);
 #else
@@ -320,7 +321,7 @@ main (int argc, char* argv[])
 
         // Correct object ids.
         //
-#ifdef HAVE_CXX11
+#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (c->o[0].object_id () == o->id);
         assert (o->c.object_id () == c->id);
 #else
@@ -352,7 +353,7 @@ main (int argc, char* argv[])
         lazy_shared_ptr<obj> l (c->o[1].lock ());
         assert (!l.loaded ());
 
-#ifdef HAVE_CXX11
+#if defined(HAVE_CXX11) && defined(ODB_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGUMENT)
         assert (l.object_id () == c->o[1].object_id ());
 #else
         assert (l.object_id<obj> () == c->o[1].object_id<obj> ());
diff --git a/common/template/Makefile.am b/common/template/Makefile.am
index 47715ce..4478502 100644
--- a/common/template/Makefile.am
+++ b/common/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options) $<
 )
diff --git a/common/template/template-vc10.vcxproj b/common/template/template-vc10.vcxproj
index bdaf37b..5666584 100644
--- a/common/template/template-vc10.vcxproj
+++ b/common/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/common/template/template-vc9.vcproj b/common/template/template-vc9.vcproj
index 9bb8cf8..caf7201 100644
--- a/common/template/template-vc9.vcproj
+++ b/common/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/libcommon/common/config-vc.h b/libcommon/common/config-vc.h
index 7031e35..d2e631d 100644
--- a/libcommon/common/config-vc.h
+++ b/libcommon/common/config-vc.h
@@ -12,7 +12,8 @@
 
 /* VC++10 has C++11 always enabled.
  */
-#if _MSC_VER >= 1600
+#if (defined(_MSC_VER) && _MSC_VER >= 1600) || \
+    (defined(ODB_MSC_VER) && ODB_MSC_VER >= 1600)
 #  define HAVE_CXX11
 #endif
 
diff --git a/mssql/template/Makefile.am b/mssql/template/Makefile.am
index 984daf7..204258b 100644
--- a/mssql/template/Makefile.am
+++ b/mssql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/mssql/template/template-vc10.vcxproj b/mssql/template/template-vc10.vcxproj
index afd612e..3f5be3e 100644
--- a/mssql/template/template-vc10.vcxproj
+++ b/mssql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/mssql/template/template-vc9.vcproj b/mssql/template/template-vc9.vcproj
index 53bef019..a1b3359 100644
--- a/mssql/template/template-vc9.vcproj
+++ b/mssql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/mysql/template/Makefile.am b/mysql/template/Makefile.am
index cd3f9b5..b748228 100644
--- a/mysql/template/Makefile.am
+++ b/mysql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/mysql/template/template-vc10.vcxproj b/mysql/template/template-vc10.vcxproj
index 6e43f64..8246eab 100644
--- a/mysql/template/template-vc10.vcxproj
+++ b/mysql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/mysql/template/template-vc9.vcproj b/mysql/template/template-vc9.vcproj
index e6a253a..387c18f 100644
--- a/mysql/template/template-vc9.vcproj
+++ b/mysql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/oracle/template/Makefile.am b/oracle/template/Makefile.am
index d7d5d84..7beba9c 100644
--- a/oracle/template/Makefile.am
+++ b/oracle/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/oracle/template/template-vc10.vcxproj b/oracle/template/template-vc10.vcxproj
index fce8b69..f1a91e0 100644
--- a/oracle/template/template-vc10.vcxproj
+++ b/oracle/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/oracle/template/template-vc9.vcproj b/oracle/template/template-vc9.vcproj
index acec7e6..97cff07 100644
--- a/oracle/template/template-vc9.vcproj
+++ b/oracle/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/pgsql/template/Makefile.am b/pgsql/template/Makefile.am
index 7f0984f..fdcd8b1 100644
--- a/pgsql/template/Makefile.am
+++ b/pgsql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/pgsql/template/template-vc10.vcxproj b/pgsql/template/template-vc10.vcxproj
index f0ac852..87f2ee1 100644
--- a/pgsql/template/template-vc10.vcxproj
+++ b/pgsql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/pgsql/template/template-vc9.vcproj b/pgsql/template/template-vc9.vcproj
index ff1cbb9..07d580d 100644
--- a/pgsql/template/template-vc9.vcproj
+++ b/pgsql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/qt/common/template/Makefile.am b/qt/common/template/Makefile.am
index a15f7b8..4101392 100644
--- a/qt/common/template/Makefile.am
+++ b/qt/common/template/Makefile.am
@@ -24,5 +24,9 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS)  __value__(odb_options) $<
diff --git a/qt/common/template/template-vc10.vcxproj b/qt/common/template/template-vc10.vcxproj
index 5283a7e..1c4b458 100644
--- a/qt/common/template/template-vc10.vcxproj
+++ b/qt/common/template/template-vc10.vcxproj
@@ -158,7 +158,7 @@
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>
   <ItemGroup>
diff --git a/qt/common/template/template-vc9.vcproj b/qt/common/template/template-vc9.vcproj
index 1ad9a61..e8a6a3c 100644
--- a/qt/common/template/template-vc9.vcproj
+++ b/qt/common/template/template-vc9.vcproj
@@ -348,7 +348,7 @@ __source_entries__(extra_sources)
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx)
diff --git a/qt/mssql/template/Makefile.am b/qt/mssql/template/Makefile.am
index 33b0868..7d944cc 100644
--- a/qt/mssql/template/Makefile.am
+++ b/qt/mssql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/qt/mssql/template/template-vc10.vcxproj b/qt/mssql/template/template-vc10.vcxproj
index d913afc..a3477e0 100644
--- a/qt/mssql/template/template-vc10.vcxproj
+++ b/qt/mssql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/qt/mssql/template/template-vc9.vcproj b/qt/mssql/template/template-vc9.vcproj
index dc38c43..dc06622 100644
--- a/qt/mssql/template/template-vc9.vcproj
+++ b/qt/mssql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/qt/mysql/template/Makefile.am b/qt/mysql/template/Makefile.am
index 1c8a6a6..1fe0055 100644
--- a/qt/mysql/template/Makefile.am
+++ b/qt/mysql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/qt/mysql/template/template-vc10.vcxproj b/qt/mysql/template/template-vc10.vcxproj
index d366643..0460825 100644
--- a/qt/mysql/template/template-vc10.vcxproj
+++ b/qt/mysql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/qt/mysql/template/template-vc9.vcproj b/qt/mysql/template/template-vc9.vcproj
index a9b474a..031e923 100644
--- a/qt/mysql/template/template-vc9.vcproj
+++ b/qt/mysql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/qt/oracle/template/Makefile.am b/qt/oracle/template/Makefile.am
index 5d19be3..6e23f58 100644
--- a/qt/oracle/template/Makefile.am
+++ b/qt/oracle/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/qt/oracle/template/template-vc10.vcxproj b/qt/oracle/template/template-vc10.vcxproj
index d984502..0ea856a 100644
--- a/qt/oracle/template/template-vc10.vcxproj
+++ b/qt/oracle/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/qt/oracle/template/template-vc9.vcproj b/qt/oracle/template/template-vc9.vcproj
index 563a440..a350894 100644
--- a/qt/oracle/template/template-vc9.vcproj
+++ b/qt/oracle/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/qt/pgsql/template/Makefile.am b/qt/pgsql/template/Makefile.am
index 5a99cfa..f5f1eed 100644
--- a/qt/pgsql/template/Makefile.am
+++ b/qt/pgsql/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/qt/pgsql/template/template-vc10.vcxproj b/qt/pgsql/template/template-vc10.vcxproj
index 37ce9a0..bc51721 100644
--- a/qt/pgsql/template/template-vc10.vcxproj
+++ b/qt/pgsql/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/qt/pgsql/template/template-vc9.vcproj b/qt/pgsql/template/template-vc9.vcproj
index fa20737..19cffcf 100644
--- a/qt/pgsql/template/template-vc9.vcproj
+++ b/qt/pgsql/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/qt/sqlite/template/Makefile.am b/qt/sqlite/template/Makefile.am
index 0448971..2470afe 100644
--- a/qt/sqlite/template/Makefile.am
+++ b/qt/sqlite/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/qt/sqlite/template/template-vc10.vcxproj b/qt/sqlite/template/template-vc10.vcxproj
index c299610..d705b5c 100644
--- a/qt/sqlite/template/template-vc10.vcxproj
+++ b/qt/sqlite/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/qt/sqlite/template/template-vc9.vcproj b/qt/sqlite/template/template-vc9.vcproj
index c4c3b95..962bde9 100644
--- a/qt/sqlite/template/template-vc9.vcproj
+++ b/qt/sqlite/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))
diff --git a/sqlite/template/Makefile.am b/sqlite/template/Makefile.am
index 6171479..baea455 100644
--- a/sqlite/template/Makefile.am
+++ b/sqlite/template/Makefile.am
@@ -26,6 +26,10 @@ ODB = @ODB@
 ODBFLAGS = @ODBFLAGS@
 ODBCPPFLAGS = @ODBCPPFLAGS@
 
+if HAVE_CXX11
+ODBFLAGS += --std c++11
+endif
+
 test-odb.hxx: test.hxx
 	$(ODB) $(AM_CPPFLAGS) $(ODBCPPFLAGS) $(CPPFLAGS) $(ODBFLAGS) __value__(odb_options) $<
 )
diff --git a/sqlite/template/template-vc10.vcxproj b/sqlite/template/template-vc10.vcxproj
index 1b70509..9cf0599 100644
--- a/sqlite/template/template-vc10.vcxproj
+++ b/sqlite/template/template-vc10.vcxproj
@@ -160,7 +160,7 @@ m4_dnl
 __custom_build_entry__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
   </ItemGroup>)
   <ItemGroup>
diff --git a/sqlite/template/template-vc9.vcproj b/sqlite/template/template-vc9.vcproj
index 9d54cbb..490567e 100644
--- a/sqlite/template/template-vc9.vcproj
+++ b/sqlite/template/template-vc9.vcproj
@@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,,
 __file_entry_custom_build__(
 test.hxx,
 odb test.hxx,
-odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1500 -I$(SolutionDir)\..\libcommon)) test.hxx,
 test-odb.hxx;test-odb.ixx;test-odb.cxx)
 __file_entry__(test-odb.hxx)
 __file_entry__(test-odb.ixx))