From bc41469ad35c0c0be8729f7323420187c1a31364 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 18 Jun 2012 16:20:04 +0200
Subject: Add argument to session ctor that indicates whether to make it
 current

---
 NEWS             |  7 +++++++
 doc/manual.xhtml | 11 ++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index acd5bf8..9a41e2f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 2.1.0
+
+ * The session constructor now accepts an options bool argument (true by
+   default) which indicates whether to make this session current for this
+   thread. For more information, refer to Chapter 10, "Session" in the ODB
+   manual.
+
 Version 2.0.0
 
   * Support for C++11. The newly supported C++11 standard library components
diff --git a/doc/manual.xhtml b/doc/manual.xhtml
index 5552657..73b4e61 100644
--- a/doc/manual.xhtml
+++ b/doc/manual.xhtml
@@ -8402,7 +8402,7 @@ namespace odb
   class session
   {
   public:
-    session ();
+    session (bool make_current = true);
     ~session ();
 
     // Copying or assignment of sessions is not supported.
@@ -8448,10 +8448,11 @@ namespace odb
 }
   </pre>
 
-  <p>The session constructor creates a new session and sets it as a
-     current session for this thread. If we try to create another
-     session while there is already a current session in effect,
-     the constructor throws the <code>odb::already_in_session</code>
+  <p>The session constructor creates a new session and, if the
+     <code>make_current</code> argument is <code>true</code>, sets it as a
+     current session for this thread. If we try to make a session current
+     while there is already another session in effect for this thread,
+     then the constructor throws the <code>odb::already_in_session</code>
      exception. The destructor clears the current session for this
      thread if this session is the current one.</p>
 
-- 
cgit v1.1