X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_smach.h;h=99a7320472de952d09347ce018ec8806d29635cb;hb=9fc439081f4226774682129daa12d25f5ae3dfcb;hp=546b64d7c5a0d63522fdc4a7bd2721e47f8fcdf4;hpb=f9cb2769597afee48e8e38ffd936d9dc14167bd8;p=synfig.git

diff --git a/ETL/trunk/ETL/_smach.h b/ETL/trunk/ETL/_smach.h
index 546b64d..99a7320 100644
--- a/ETL/trunk/ETL/_smach.h
+++ b/ETL/trunk/ETL/_smach.h
@@ -4,6 +4,7 @@
 ** $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
@@ -38,7 +39,7 @@
 
 #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)
@@ -98,7 +99,7 @@ public:
 
 	//! Event definition class
 	template<typename T>
-	class event_def
+	class event_def_internal
 	{
 		// List our friends
 		friend class smach;
@@ -118,11 +119,11 @@ public:
 	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.
@@ -134,13 +135,13 @@ public:
 			{ 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) { }
 
 	};
 
@@ -168,7 +169,7 @@ public:
 		friend class smach;
 
 	public:
-		typedef event_def<T> event_def;
+		typedef event_def_internal<T> event_def;
 		typedef T state_context_type;
 
 
@@ -338,7 +339,7 @@ public:
 		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);
 
@@ -391,7 +392,7 @@ public:
 		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
@@ -416,7 +417,7 @@ public:
 		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();