From 4a823acce0d49b4edc835cf2df3fe091cbf5e24a Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 25 May 2009 12:04:29 +0000
Subject: [PATCH] Changed Status enums to ActionStatus and TimelineStatus to
 avoid X11 problems

---
 include/osgAnimation/Timeline | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/osgAnimation/Timeline b/include/osgAnimation/Timeline
index 147dfef16..c7c1847f1 100644
--- a/include/osgAnimation/Timeline
+++ b/include/osgAnimation/Timeline
@@ -152,13 +152,13 @@ namespace osgAnimation
         unsigned int _numberFrame;
         unsigned int _loop;
 
-        enum Status
+        enum ActionStatus
         {
             Play,
             Stop
         };
         
-        Status _state;
+        ActionStatus _state;
     };
 
 
@@ -171,13 +171,13 @@ namespace osgAnimation
         Timeline();
         Timeline(const Timeline& nc,const osg::CopyOp& op = osg::CopyOp::SHALLOW_COPY);
 
-        enum Status
+        enum TimelineStatus
         {
             Play,
             Stop
         };
 
-        Status getStatus() const { return _state; }
+        TimelineStatus getStatus() const { return _state; }
 
         typedef std::pair<unsigned int, osg::ref_ptr<Action> > FrameAction;
         typedef std::vector<FrameAction> ActionList;
@@ -326,7 +326,7 @@ namespace osgAnimation
         bool _loop;
         bool _initFirstFrame;
 
-        Status _state;
+        TimelineStatus _state;
 
         // to manage pending operation
         bool _evaluating;