From 9ad0acf37561de9bf359a561faed53de17c2ca3b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Nov 2012 13:11:43 +0200
Subject: Add dynamic multi-database query support

---
 odb/option-types.hxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'odb/option-types.hxx')

diff --git a/odb/option-types.hxx b/odb/option-types.hxx
index b65589c..09be4ee 100644
--- a/odb/option-types.hxx
+++ b/odb/option-types.hxx
@@ -7,8 +7,10 @@
 
 #include <map>
 #include <iosfwd>
+#include <string>
 #include <cassert>
 
+
 #include <odb/semantics/relational/name.hxx>
 
 using semantics::relational::qname;
@@ -24,7 +26,7 @@ struct cxx_version
   cxx_version (value v = value (0)) : v_ (v) {}
   operator value () const {return v_;}
 
-  const char*
+  std::string
   string () const;
 
 private:
@@ -53,12 +55,12 @@ struct database
   database (value v = value (0)) : v_ (v) {}
   operator value () const {return v_;}
 
-  const char*
+  std::string
   string () const;
 
   // Full name (e.g., PostgreSQL).
   //
-  const char*
+  std::string
   name () const;
 
 private:
@@ -105,7 +107,7 @@ struct multi_database
   multi_database (value v = disabled) : v_ (v) {}
   operator value () const {return v_;}
 
-  const char*
+  std::string
   string () const;
 
 private:
@@ -134,7 +136,7 @@ struct schema_format
   schema_format (value v = value (0)) : v_ (v) {}
   operator value () const {return v_;}
 
-  const char*
+  std::string
   string () const;
 
 private:
-- 
cgit v1.1