** $Id$
**
** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2008 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
#ifdef _MSC_VER
#pragma warning (disable:4786)
-#pragma warning (disable:4290) // MSVC6 doesnt like function declarations with exception specs
+#pragma warning (disable:4290) // MSVC6 doesn't like function declarations with exception specs
#endif
//#define ETL_MUTEX_LOCK() _mutex::lock lock(mutex)
//! Event definition class
template<typename T>
- class event_def
+ class event_def_internal
{
// List our friends
friend class smach;
public:
//! Less-than operator for sorting. Based on event_key value.
- bool operator<(const event_def &rhs)const
+ bool operator<(const event_def_internal &rhs)const
{ return id<rhs.id; }
//! Equal-to operator. Based on event_key value.
- bool operator==(const event_def &rhs)const
+ bool operator==(const event_def_internal &rhs)const
{ return id==rhs.id; }
//! Less-than operator for finding.
{ return id==rhs; }
//! Trivial Constructor
- event_def() { }
+ event_def_internal() { }
- //! Constructor for creating an event_def from the given key and function reference.
- event_def(event_key a, funcptr b):id(a),handler(b) { }
+ //! Constructor for creating an event_def_internal from the given key and function reference.
+ event_def_internal(event_key a, funcptr b):id(a),handler(b) { }
//! Copy constructor
- event_def(const event_def &x):id(x.id),handler(x.handler) { }
+ event_def_internal(const event_def_internal &x):id(x.id),handler(x.handler) { }
};
friend class smach;
public:
- typedef event_def<T> event_def;
+ typedef event_def_internal<T> event_def;
typedef T state_context_type;
const state_base *prev_state=default_state;
// If we are already in a state, leave it and
- // colapse the state stack
+ // collapse the state stack
if(default_state)
default_state->leave_state(default_context);
while(states_on_stack) pop_state();
// If we are not in a state, then I guess
- // we were succesful.
+ // we were successful.
if(!curr_state)
return true;
const state_base* old_state=curr_state;
void *old_context=state_context;
- // Clear out the current state and it's state_context
+ // Clear out the current state and its state_context
curr_state=0;state_context=0;
// Leave the state
const state_base *prev_state=curr_state;
// If we are already in a state, leave it and
- // colapse the state stack
+ // collapse the state stack
if(curr_state)
egress();