From 0ec96dc9bd274f5c79f37d95ca0abcc24099217a Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 26 Jan 2008 10:49:39 +0000 Subject: [PATCH] Prevent warning from g++ 4.3: [ETL/_smach.h:171] declaration of 'typedef class etl::smach::event_def etl::smach::state::event_def' [ETL/_smach.h:102] changes meaning of 'event_def' from 'class etl::smach::event_def'. git-svn-id: http://svn.voria.com/code@1496 1f10aa63-cdf2-0310-b900-c93c546f37ac --- ETL/trunk/ETL/_smach.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 - 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 event_def; + typedef event_def_internal event_def; typedef T state_context_type; -- 2.7.4