Эх сурвалжийг харах

[cpp] Fixed shadow declaration warnings. Closes #1808.

Harald Csaszar 4 жил өмнө
parent
commit
e9f900c333

+ 8 - 0
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;
 

+ 0 - 9
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)),