From e9f900c3331ff66585e6e390d7d5b886e3bb24f3 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 16 Feb 2021 19:59:28 +0100 Subject: [PATCH] [cpp] Fixed shadow declaration warnings. Closes #1808. --- spine-cpp/spine-cpp/include/spine/AnimationState.h | 8 ++++++++ spine-cpp/spine-cpp/src/spine/AnimationState.cpp | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/spine-cpp/spine-cpp/include/spine/AnimationState.h b/spine-cpp/spine-cpp/include/spine/AnimationState.h index 8f165da52..300edf0a3 100644 --- a/spine-cpp/spine-cpp/include/spine/AnimationState.h +++ b/spine-cpp/spine-cpp/include/spine/AnimationState.h @@ -387,6 +387,14 @@ namespace spine { void enableQueue(); private: + static const int Subsequent = 0; + static const int First = 1; + static const int HoldSubsequent = 2; + static const int HoldFirst = 3; + static const int HoldMix = 4; + + static const int Setup = 1; + static const int Current = 2; AnimationStateData* _data; diff --git a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp index 5980ea72b..6185b8855 100644 --- a/spine-cpp/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/spine-cpp/src/spine/AnimationState.cpp @@ -288,15 +288,6 @@ void EventQueue::drain() { _drainDisabled = false; } -const int Subsequent = 0; -const int First = 1; -const int HoldSubsequent = 2; -const int HoldFirst = 3; -const int HoldMix = 4; - -const int Setup = 1; -const int Current = 2; - AnimationState::AnimationState(AnimationStateData *data) : _data(data), _queue(EventQueue::newEventQueue(*this, _trackEntryPool)),