[Boost-commit] svn:boost r83390 - in branches/release: . boost boost/xpressive boost/xpressive/detail/utility

Subject: [Boost-commit] svn:boost r83390 - in branches/release: . boost boost/xpressive boost/xpressive/detail/utility
From: eric_at_[hidden]
Date: 2013-03-09 19:41:52

Author: eric_niebler
Date: 2013-03-09 19:41:51 EST (Sat, 09 Mar 2013)
New Revision: 83390
URL: http://svn.boost.org/trac/boost/changeset/83390

Log:
merge [83304] from trunk, fixes #8138
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/xpressive/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/detail/utility/sequence_stack.hpp |     5 ++++-                                   
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: branches/release/boost/xpressive/detail/utility/sequence_stack.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/utility/sequence_stack.hpp	(original)
+++ branches/release/boost/xpressive/detail/utility/sequence_stack.hpp	2013-03-09 19:41:51 EST (Sat, 09 Mar 2013)
@@ -115,7 +115,10 @@
             }
 
             // grow exponentially
-            std::size_t new_size = (std::max)(count, static_cast<std::size_t>(this->current_chunk_->size() * 1.5));
+            std::size_t new_size = (std::max)(
+                count
+              , static_cast<std::size_t>(static_cast<double>(this->current_chunk_->size()) * 1.5)
+            );
 
             // Create a new expr and insert it into the list
             this->current_chunk_ = new chunk(new_size, t, count, this->current_chunk_, this->current_chunk_->next_);