Update of /cvsroot/boost/boost/libs/statechart/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30004/libs/statechart/test
Modified Files:
TransitionTest.cpp
Log Message:
Added a couple of & to hint to the compiler that we want to take the address of
a function. This should fix a few Intel 9.1 failures.
Index: TransitionTest.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/statechart/test/TransitionTest.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- TransitionTest.cpp 25 Mar 2007 10:09:16 -0000 1.17
+++ TransitionTest.cpp 25 Mar 2007 10:20:55 -0000 1.18
@@ -84,19 +84,19 @@
template< class State >
void Entry( ActionDescriptionSequence & sequence )
{
- sequence.push_back( &::EntryDescription< State > );
+ sequence.push_back( &EntryDescription< State > );
}
template< class State >
void ExitFn( ActionDescriptionSequence & sequence )
{
- sequence.push_back( &::ExitFnDescription< State > );
+ sequence.push_back( &ExitFnDescription< State > );
}
template< class State >
void Dtor( ActionDescriptionSequence & sequence )
{
- sequence.push_back( &::DtorDescription< State > );
+ sequence.push_back( &DtorDescription< State > );
}
template< class State >
@@ -109,13 +109,13 @@
template< class Context, class Event >
void Trans( ActionDescriptionSequence & sequence )
{
- sequence.push_back( &::TransDescription< Context, Event > );
+ sequence.push_back( &TransDescription< Context, Event > );
}
template< ActionPtr pAction >
void Throw( ActionDescriptionSequence & sequence )
{
- sequence.push_back( &::ThrowDescription< pAction > );
+ sequence.push_back( &ThrowDescription< pAction > );
}
const int arrayLength = 30;
@@ -210,25 +210,25 @@
template< class State >
void ActualEntry()
{
- StoreActualAction< &::Entry< State > >();
+ StoreActualAction< &Entry< State > >();
}
template< class State >
void ActualExitFunction()
{
- StoreActualAction< &::ExitFn< State > >();
+ StoreActualAction< &ExitFn< State > >();
}
template< class State >
void ActualDestructor()
{
- StoreActualAction< &::Dtor< State > >();
+ StoreActualAction< &Dtor< State > >();
}
template< class Context, class Event >
void ActualTransition()
{
- StoreActualAction< &::Trans< Context, Event > >();
+ StoreActualAction< &Trans< Context, Event > >();
}
void unconsumed_event( const sc::event_base & )
@@ -708,27 +708,27 @@
};
machine.CompareToExpectedActionSequence( term );
- machine.ThrowAction( &::Entry< Default0< S1< M > > > );
+ machine.ThrowAction( &Entry< Default0< S1< M > > > );
BOOST_REQUIRE_THROW( machine.initiate(), TransitionTestException );
ActionArray initThrow1 =
{
Entry< S0< M > >,
Entry< S1< M > >,
- Throw< &::Entry< Default0< S1< M > > > >,
+ Throw< &Entry< Default0< S1< M > > > >,
Dtor< S1< M > >,
Dtor< S0< M > >
};
machine.CompareToExpectedActionSequence( initThrow1 );
BOOST_REQUIRE( machine.terminated() );
- machine.ThrowAction( &::Entry< S11< M > > );
+ machine.ThrowAction( &Entry< S11< M > > );
BOOST_REQUIRE_THROW( machine.initiate(), TransitionTestException );
ActionArray initThrow2 =
{
Entry< S0< M > >,
Entry< S1< M > >,
Entry< Default0< S1< M > > >,
- Throw< &::Entry< S11< M > > >,
+ Throw< &Entry< S11< M > > >,
Dtor< Default0< S1< M > > >,
Dtor< S1< M > >,
Dtor< S0< M > >
@@ -736,7 +736,7 @@
machine.CompareToExpectedActionSequence( initThrow2 );
BOOST_REQUIRE( machine.terminated() );
- machine.ThrowAction( &::Trans< S0< M >, A > );
+ machine.ThrowAction( &Trans< S0< M >, A > );
machine.initiate();
BOOST_REQUIRE_THROW( machine.process_event( A() ), TransitionTestException );
ActionArray a1Throw1 =
@@ -752,7 +752,7 @@
Exit< S11< M > >,
Exit< Default0< S1< M > > >,
Exit< S1< M > >,
- Throw< &::Trans< S0< M >, A > >,
+ Throw< &Trans< S0< M >, A > >,
Dtor< Default2< S0< M > > >,
Dtor< Default1< S0< M > > >,
Dtor< S0< M > >
@@ -760,7 +760,7 @@
machine.CompareToExpectedActionSequence( a1Throw1 );
BOOST_REQUIRE( machine.terminated() );
- machine.ThrowAction( &::Entry< S211< M > > );
+ machine.ThrowAction( &Entry< S211< M > > );
machine.initiate();
BOOST_REQUIRE_THROW( machine.process_event( C() ), TransitionTestException );
ActionArray c1Throw1 =
@@ -782,7 +782,7 @@
Entry< Default1< S2< M > > >,
Entry< S21< M > >,
Entry< Default0< S21< M > > >,
- Throw< &::Entry< S211< M > > >,
+ Throw< &Entry< S211< M > > >,
Dtor< Default2< S0< M > > >,
Dtor< Default1< S0< M > > >,
Dtor< Default0< S21< M > > >,
@@ -795,7 +795,7 @@
machine.CompareToExpectedActionSequence( c1Throw1 );
BOOST_REQUIRE( machine.terminated() );
- machine.ThrowAction( &::ExitFn< S11< M > > );
+ machine.ThrowAction( &ExitFn< S11< M > > );
machine.initiate();
BOOST_REQUIRE_THROW( machine.process_event( C() ), TransitionTestException );
ActionArray c1Throw2 =
@@ -808,7 +808,7 @@
Entry< Default1< S0< M > > >,
Entry< Default2< S0< M > > >,
Exit< Default2< S1< M > > >,
- Throw< &::ExitFn< S11< M > > >,
+ Throw< &ExitFn< S11< M > > >,
Dtor< S11< M > >,
Dtor< Default2< S0< M > > >,
Dtor< Default1< S0< M > > >,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
