|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67549 - in branches/release: boost/statechart libs/statechart libs/statechart/doc libs/statechart/test
From: ahd6974-boostorg_at_[hidden]
Date: 2011-01-01 15:13:02
Author: andreas_huber69
Date: 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
New Revision: 67549
URL: http://svn.boost.org/trac/boost/changeset/67549
Log:
Merged 1.46 changes from trunk to the release branch.
Properties modified:
branches/release/boost/statechart/ (props changed)
branches/release/libs/statechart/ (props changed)
Text files modified:
branches/release/boost/statechart/event.hpp | 4 +++
branches/release/boost/statechart/simple_state.hpp | 19 +++++-----------
branches/release/boost/statechart/state_machine.hpp | 45 ++++++++++++++++-----------------------
branches/release/libs/statechart/doc/acknowledgments.html | 11 +++++----
branches/release/libs/statechart/doc/future_and_history.html | 8 +++++++
branches/release/libs/statechart/doc/reference.html | 14 +++++++-----
branches/release/libs/statechart/test/CustomReactionTest.vcproj | 4 +-
branches/release/libs/statechart/test/DeferralTest.vcproj | 4 +-
branches/release/libs/statechart/test/FifoSchedulerTest.vcproj | 4 +-
branches/release/libs/statechart/test/HistoryTest.vcproj | 4 +-
branches/release/libs/statechart/test/InStateReactionTest.vcproj | 4 +-
branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj | 4 +-
branches/release/libs/statechart/test/Jamfile.v2 | 1
branches/release/libs/statechart/test/StateCastTest.vcproj | 4 +-
branches/release/libs/statechart/test/StateIterationTest.vcproj | 4 +-
branches/release/libs/statechart/test/TerminationTest.vcproj | 4 +-
branches/release/libs/statechart/test/TransitionTest.vcproj | 4 +-
branches/release/libs/statechart/test/TriggeringEventTest.vcproj | 4 +-
branches/release/libs/statechart/test/TuTest.vcproj | 4 +-
branches/release/libs/statechart/test/TypeInfoTest.vcproj | 4 +-
branches/release/libs/statechart/test/UnconsumedResultTest.vcproj | 4 +-
21 files changed, 80 insertions(+), 78 deletions(-)
Modified: branches/release/boost/statechart/event.hpp
==============================================================================
--- branches/release/boost/statechart/event.hpp (original)
+++ branches/release/boost/statechart/event.hpp 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -50,6 +50,10 @@
detail::deallocate< MostDerived, Allocator >( pEvent );
}
+ void operator delete( void * pEvent, void * p )
+ {
+ }
+
protected:
//////////////////////////////////////////////////////////////////////////
event() {}
Modified: branches/release/boost/statechart/simple_state.hpp
==============================================================================
--- branches/release/boost/statechart/simple_state.hpp (original)
+++ branches/release/boost/statechart/simple_state.hpp 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -365,7 +365,7 @@
{
if ( this->deferred_events() )
{
- outermost_context_base().release_events( this );
+ outermost_context_base().release_events();
}
pContext_->remove_inner_state( orthogonal_position::value );
@@ -490,19 +490,12 @@
// At this point we can only safely access pContext_ if the handler did
// not return do_discard_event!
- switch ( reactionResult )
+ if ( reactionResult == detail::do_forward_event )
{
- case detail::do_forward_event:
- // TODO: The following call to react_impl of our outer state should
- // be made with a context_type:: prefix to call directly instead of
- // virtually. For some reason the compiler complains...
- reactionResult = pContext_->react_impl( evt, eventType );
- break;
- case detail::do_defer_event:
- outermost_context_base().defer_event( evt, this );
- break;
- default:
- break;
+ // TODO: The following call to react_impl of our outer state should
+ // be made with a context_type:: prefix to call directly instead of
+ // virtually. For some reason the compiler complains...
+ reactionResult = pContext_->react_impl( evt, eventType );
}
return reactionResult;
Modified: branches/release/boost/statechart/state_machine.hpp
==============================================================================
--- branches/release/boost/statechart/state_machine.hpp (original)
+++ branches/release/boost/statechart/state_machine.hpp 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_STATE_MACHINE_HPP_INCLUDED
#define BOOST_STATECHART_STATE_MACHINE_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2008 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)
//////////////////////////////////////////////////////////////////////////////
@@ -272,7 +272,11 @@
void process_event( const event_base_type & evt )
{
- send_event( evt );
+ if ( send_event( evt ) == detail::do_defer_event )
+ {
+ deferredEventQueue_.push_back( evt.intrusive_from_this() );
+ }
+
process_queued_events();
}
@@ -638,26 +642,9 @@
}
- void defer_event(
- const event_base_type & evt,
- const state_base_type * pForState )
+ void release_events()
{
- deferredMap_[ pForState ].push_back( evt.intrusive_from_this() );
- }
-
- void release_events( const state_base_type * pForState )
- {
- const typename deferred_map_type::iterator pFound =
- deferredMap_.find( pForState );
-
- // We are not guaranteed to find an entry because a state is marked for
- // having deferred events _before_ the event is actually deferred. An
- // exception might be thrown during deferral.
- if ( pFound != deferredMap_.end() )
- {
- eventQueue_.splice( eventQueue_.end(), pFound->second );
- deferredMap_.erase( pFound );
- }
+ eventQueue_.splice( eventQueue_.begin(), deferredEventQueue_ );
}
@@ -880,7 +867,7 @@
friend class terminator;
- void send_event( const event_base_type & evt )
+ detail::reaction_result send_event( const event_base_type & evt )
{
terminator guard( *this, &evt );
BOOST_ASSERT( get_pointer( pOutermostUnstableState_ ) == 0 );
@@ -908,6 +895,8 @@
{
polymorphic_downcast< MostDerived * >( this )->unconsumed_event( evt );
}
+
+ return reactionResult;
}
@@ -915,9 +904,13 @@
{
while ( !eventQueue_.empty() )
{
- const event_base_ptr_type pCurrentEvent( eventQueue_.front() );
+ event_base_ptr_type pEvent = eventQueue_.front();
eventQueue_.pop_front();
- send_event( *pCurrentEvent );
+
+ if ( send_event( *pEvent ) == detail::do_defer_event )
+ {
+ deferredEventQueue_.push_back( pEvent );
+ }
}
}
@@ -928,11 +921,11 @@
if ( !terminated() )
{
- // this also empties deferredMap_
terminate_impl( *pOutermostState_, performFullExit );
}
eventQueue_.clear();
+ deferredEventQueue_.clear();
shallowHistoryMap_.clear();
deepHistoryMap_.clear();
}
@@ -1075,7 +1068,7 @@
event_queue_type eventQueue_;
- deferred_map_type deferredMap_;
+ event_queue_type deferredEventQueue_;
state_list_type currentStates_;
typename state_list_type::iterator currentStatesEnd_;
state_base_type * pOutermostState_;
Modified: branches/release/libs/statechart/doc/acknowledgments.html
==============================================================================
--- branches/release/libs/statechart/doc/acknowledgments.html (original)
+++ branches/release/libs/statechart/doc/acknowledgments.html 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -80,6 +80,8 @@
<li>Joaquín M López Muñoz for his broken allocator
workaround in boost/detail/allocator_utilities.hpp</li>
+
+ <li>Igor R for uncovering and reporting several bugs</li>
</ul>
<p>Thanks for feedback and/or encouragement go to:</p>
@@ -90,17 +92,16 @@
Gregor, Gustavo Guerra, Aleksey Gurtovoy, Federico J. Fernández,
Iain K. Hanson, Steve Hawkes, David B. Held, Jü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>
+ 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>
<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 04 April, 2010</p>
+ <p>Revised 06 November, 2010</p>
<p><i>Copyright © 2003-2010 <a href="contact.html">Andreas Huber
Dönni</a></i></p>
Modified: branches/release/libs/statechart/doc/future_and_history.html
==============================================================================
--- branches/release/libs/statechart/doc/future_and_history.html (original)
+++ branches/release/libs/statechart/doc/future_and_history.html 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -127,6 +127,14 @@
<p>(<font color="#FF0000">red</font> = points raised during formal
review)</p>
+ <p>1.46.0</p>
+ <ul>
+ <li>Fixed Bug #4817 (The order of deferred events is not preserved under
+ certain circumstances), reported by Igor R</li>
+ <li>Fixed Bug #4511 (MSVC10 warning due to lack of placement operator
+ delete), reported by Igor R</li>
+ </ul>
+
<p>1.43.0</p>
<ul>
<li>Generalized the context() functions so that they can also return a
Modified: branches/release/libs/statechart/doc/reference.html
==============================================================================
--- branches/release/libs/statechart/doc/reference.html (original)
+++ branches/release/libs/statechart/doc/reference.html 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -1069,8 +1069,8 @@
<li>If the return value of <code>ExceptionTranslator::operator()()</code>
is equal to the one of <code>simple_state<>::defer_event()</code>
then the return value of <code>currentEvent.<a href=
- "#intrusive_from_this">intrusive_from_this</a>()</code> is stored in a
- state-specific queue. Continues with step 11</li>
+ "#intrusive_from_this">intrusive_from_this</a>()</code> is stored in the
+ deferred events queue. Continues with step 11</li>
<li>If the return value of <code>ExceptionTranslator::operator()()</code>
is equal to the one of <code>simple_state<>::discard_event()</code>
@@ -2160,8 +2160,10 @@
<a name="simple_statedtor" id="simple_statedtor">~simple_state</a>();
</pre>
- <p><b>Effects</b>: Pushes all events deferred by the state into the posted
- events queue</p>
+ <p><b>Effects</b>: If the state has deferral reactions of which at least
+ one has been triggered during the lifetime of the state then the contents
+ of the deferred events queue is moved to the front of the posted events
+ queue.</p>
<h3>Class template <code>simple_state</code> modifier functions</h3>
<pre>
@@ -3579,9 +3581,9 @@
"../../../doc/images/valid-html401.png" alt="Valid HTML 4.01 Transitional"
height="31" width="88"></a></p>
- <p>Revised 06 January, 2008</p>
+ <p>Revised 06 November, 2010</p>
- <p><i>Copyright © 2003-2008 <a href="contact.html">Andreas Huber
+ <p><i>Copyright © 2003-2010 <a href="contact.html">Andreas Huber
Dönni</a></i></p>
<p><i>Distributed under the Boost Software License, Version 1.0. (See
Modified: branches/release/libs/statechart/test/CustomReactionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/CustomReactionTest.vcproj (original)
+++ branches/release/libs/statechart/test/CustomReactionTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/CustomReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/DeferralTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/DeferralTest.vcproj (original)
+++ branches/release/libs/statechart/test/DeferralTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/DeferralTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/FifoSchedulerTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/FifoSchedulerTest.vcproj (original)
+++ branches/release/libs/statechart/test/FifoSchedulerTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/FifoSchedulerTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/HistoryTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/HistoryTest.vcproj (original)
+++ branches/release/libs/statechart/test/HistoryTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/HistoryTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/InStateReactionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/InStateReactionTest.vcproj (original)
+++ branches/release/libs/statechart/test/InStateReactionTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/InStateReactionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj (original)
+++ branches/release/libs/statechart/test/InvalidResultCopyTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/InvalidResultCopyTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/Jamfile.v2
==============================================================================
--- branches/release/libs/statechart/test/Jamfile.v2 (original)
+++ branches/release/libs/statechart/test/Jamfile.v2 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -118,6 +118,7 @@
[ statechart-st-run-variants InStateReactionTest ]
[ statechart-st-run-variants TerminationTest ]
[ statechart-st-run-variants DeferralTest ]
+ [ statechart-st-run-variants DeferralBug ]
[ statechart-st-run-variants CustomReactionTest ]
[ statechart-compile-fail-variants InvalidResultAssignTest ]
[ statechart-compile-fail-variants InvalidResultDefCtorTest ]
Modified: branches/release/libs/statechart/test/StateCastTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/StateCastTest.vcproj (original)
+++ branches/release/libs/statechart/test/StateCastTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/StateCastTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/StateIterationTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/StateIterationTest.vcproj (original)
+++ branches/release/libs/statechart/test/StateIterationTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/StateIterationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TerminationTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TerminationTest.vcproj (original)
+++ branches/release/libs/statechart/test/TerminationTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/TerminationTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TransitionTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TransitionTest.vcproj (original)
+++ branches/release/libs/statechart/test/TransitionTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/TransitionTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TriggeringEventTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TriggeringEventTest.vcproj (original)
+++ branches/release/libs/statechart/test/TriggeringEventTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/TriggeringEventTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/TriggeringEventTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TuTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TuTest.vcproj (original)
+++ branches/release/libs/statechart/test/TuTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/TuTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/TypeInfoTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/TypeInfoTest.vcproj (original)
+++ branches/release/libs/statechart/test/TypeInfoTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/TypeInfoTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Modified: branches/release/libs/statechart/test/UnconsumedResultTest.vcproj
==============================================================================
--- branches/release/libs/statechart/test/UnconsumedResultTest.vcproj (original)
+++ branches/release/libs/statechart/test/UnconsumedResultTest.vcproj 2011-01-01 15:12:47 EST (Sat, 01 Jan 2011)
@@ -68,7 +68,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-gd-1_45.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
@@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_40.lib"
+ AdditionalDependencies="libboost_test_exec_monitor-vc90-mt-1_45.lib"
OutputFile="$(OutDir)/UnconsumedResultTest.exe"
LinkIncremental="1"
AdditionalLibraryDirectories=""$(ProjectDir)..\..\..\bin.v2\libs\test\build\msvc-9.0\$(ConfigurationName)\asynch-exceptions-on\link-static\threading-multi""
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk