From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sat, 26 Jan 2008 10:49:39 +0000 (+0000)
Subject: Prevent warning from g++ 4.3: [ETL/_smach.h:171] declaration of 'typedef class etl... 
X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=commitdiff_plain;h=0ec96dc9bd274f5c79f37d95ca0abcc24099217a

Prevent warning from g++ 4.3: [ETL/_smach.h:171] declaration of 'typedef class etl::smach<CON, K, M>::event_def<T> etl::smach<CON, K, M>::state<T>::event_def' [ETL/_smach.h:102] changes meaning of 'event_def' from 'class etl::smach<CON, K, M>::event_def<T>'.


git-svn-id: http://svn.voria.com/code@1496 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/ETL/trunk/ETL/_smach.h b/ETL/trunk/ETL/_smach.h
index 992d09b..de00d6d 100644
--- a/ETL/trunk/ETL/_smach.h
+++ b/ETL/trunk/ETL/_smach.h
@@ -98,7 +98,7 @@ public:
 
 	//! Event definition class
 	template<typename T>
-	class event_def
+	class event_def_internal
 	{
 		// List our friends
 		friend class smach;
@@ -118,11 +118,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 +134,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 +168,7 @@ public:
 		friend class smach;
 
 	public:
-		typedef event_def<T> event_def;
+		typedef event_def_internal<T> event_def;
 		typedef T state_context_type;