[Boost-commit] svn:boost r61047 - in trunk: boost/statechart libs/statechart/doc

Subject: [Boost-commit] svn:boost r61047 - in trunk: boost/statechart libs/statechart/doc
From: ahd6974-boostorg_at_[hidden]
Date: 2010-04-04 12:27:48

Author: andreas_huber69
Date: 2010-04-04 12:27:48 EDT (Sun, 04 Apr 2010)
New Revision: 61047
URL: http://svn.boost.org/trac/boost/changeset/61047

Log:
Fixes #3329. Thanks for the report!
Text files modified: 
   trunk/boost/statechart/result.hpp                 |    18 +++++++++---------                      
   trunk/libs/statechart/doc/acknowledgments.html    |    20 ++++++++++----------                    
   trunk/libs/statechart/doc/future_and_history.html |     5 +++--                                   
   3 files changed, 22 insertions(+), 21 deletions(-)

Modified: trunk/boost/statechart/result.hpp
==============================================================================
--- trunk/boost/statechart/result.hpp	(original)
+++ trunk/boost/statechart/result.hpp	2010-04-04 12:27:48 EDT (Sun, 04 Apr 2010)
@@ -1,7 +1,7 @@
 #ifndef BOOST_STATECHART_RESULT_HPP_INCLUDED
 #define BOOST_STATECHART_RESULT_HPP_INCLUDED
 //////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2010 Andreas Huber Doenni
 // Distributed under the Boost Software License, Version 1.0. (See accompany-
 // ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //////////////////////////////////////////////////////////////////////////////
@@ -39,13 +39,13 @@
   public:
     //////////////////////////////////////////////////////////////////////////
     safe_reaction_result( const safe_reaction_result & other ) :
-      reactionResult( other.reactionResult )
+      reactionResult_( other.reactionResult_ )
     {
       // This assert fails when an attempt is made to make multiple copies of
       // a result value. This makes little sense, given the requirement that
       // an obtained result value must be returned out of the react function.
-      BOOST_ASSERT( reactionResult != consumed );
-      other.reactionResult = consumed;
+      BOOST_ASSERT( reactionResult_ != consumed );
+      other.reactionResult_ = consumed;
     }
 
     ~safe_reaction_result()
@@ -55,26 +55,26 @@
       // makes more than one call to reaction functions inside react() or
       // accidentally makes one or more calls to reaction functions outside
       // react()
-      BOOST_ASSERT( reactionResult == consumed );
+      BOOST_ASSERT( reactionResult_ == consumed );
     }
 
   private:
     //////////////////////////////////////////////////////////////////////////
     safe_reaction_result( reaction_result reactionResult ) :
-      reactionResult( reactionResult )
+      reactionResult_( reactionResult )
     {
     }
 
     operator reaction_result() const
     {
-      const reaction_result val = reactionResult;
-      reactionResult = consumed;
+      const reaction_result val = reactionResult_;
+      reactionResult_ = consumed;
       return val;
     }
 
     safe_reaction_result & operator=( const safe_reaction_result & );
 
-    mutable reaction_result reactionResult;
+    mutable reaction_result reactionResult_;
 
     friend struct result_utility;
 };

Modified: trunk/libs/statechart/doc/acknowledgments.html
==============================================================================
--- trunk/libs/statechart/doc/acknowledgments.html	(original)
+++ trunk/libs/statechart/doc/acknowledgments.html	2010-04-04 12:27:48 EDT (Sun, 04 Apr 2010)
@@ -85,23 +85,23 @@
   <p>Thanks for feedback and/or encouragement go to:</p>
 
   <p>Bardur Arantsson, Robert Bell, Bohdan, Wayne Chao, Topher Cooper,
-  Philippe David, Peter Dimov, Reece Dunn, John Fuller, Jeff Garland, Eugene
-  Gladyshev, David A. Greene, Douglas Gregor, Gustavo Guerra, Aleksey
-  Gurtovoy, Federico J. Fern&aacute;ndez, Iain K. Hanson, Steve Hawkes,
-  David B. Held, J&uuml;rgen Hunold, Sean Kelly, Oliver Kowalke, Simon
-  Meiklejohn, Jiang Miao, Johan Nilsson, Matthieu Paindavoine, Chris Paulse,
-  Yuval Ronen, Chris Russell, Bryan Silverthorn, Rob Stewart, Kwee Heong Tan,
-  Marcin Tustin, Vincent N. Virgilio, Gang Wang, Steven Watanabe, Richard
-  Webb and Scott Woods.</p>
+  Philippe David, Peter Dimov, Reece Dunn, Grant Erickson, John Fuller,
+  Jeff Garland, Eugene Gladyshev, David A. Greene, Douglas Gregor, Gustavo
+  Guerra, Aleksey Gurtovoy, Federico J. Fern&aacute;ndez, Iain K. Hanson,
+  Steve Hawkes, David B. Held, J&uuml;rgen Hunold, Sean Kelly, Oliver
+  Kowalke, Thomas Mathys, Simon Meiklejohn, Jiang Miao, Johan Nilsson,
+  Matthieu Paindavoine, Chris Paulse, Igor R, Yuval Ronen, Chris Russell,
+  Bryan Silverthorn, Rob Stewart, Kwee Heong Tan, Marcin Tustin, Vincent N.
+  Virgilio, Gang Wang, Steven Watanabe, Richard Webb and Scott Woods.</p>
   <hr>
 
   <p><a href="http://validator.w3.org/check?uri=referer"><img border="0" src=
   "../../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
-  <p>Revised 06 July, 2009</p>
+  <p>Revised 04 April, 2010</p>
 
-  <p><i>Copyright &copy; 2003-2008 <a href="contact.html">Andreas Huber
+  <p><i>Copyright &copy; 2003-2010 <a href="contact.html">Andreas Huber
   D&ouml;nni</a></i></p>
 
 

Modified: trunk/libs/statechart/doc/future_and_history.html
==============================================================================
--- trunk/libs/statechart/doc/future_and_history.html	(original)
+++ trunk/libs/statechart/doc/future_and_history.html	2010-04-04 12:27:48 EDT (Sun, 04 Apr 2010)
@@ -133,6 +133,7 @@
     reference to any public base type of a context. This also makes
     transition&lt;&gt; &amp; in_state_reaction&lt;&gt; more general, reported by Igor R</li>
     <li>Added triggering_event()</li>
+    <li>Fixed Bug #3329 (shadow variable warnings), reported by Grant Erickson</li>
   </ul>
 
   <p>1.40.0</p>
@@ -698,9 +699,9 @@
   "../../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
   height="31" width="88"></a></p>
 
-  <p>Revised 27 June, 2009</p>
+  <p>Revised 04 April, 2010</p>
 
-  <p><i>Copyright &copy; 2003-2009 <a href="contact.html">Andreas Huber
+  <p><i>Copyright &copy; 2003-2010 <a href="contact.html">Andreas Huber
   D&ouml;nni</a></i></p>
 
   <p><i>Distributed under the Boost Software License, Version 1.0. (See