From 49e2e8964e2fc27846bf2258d7901fab020a8387 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Wed, 8 Apr 2015 21:40:39 -0700 Subject: [PATCH] more compilations issues. compiles on Android --- .../CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp | 3 ++- .../CocoStudioActionTimelineTest/ActionTimelineTestScene.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp index d0d8903965..767ea53cec 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp @@ -5,8 +5,9 @@ #include "VisibleRect.h" -using namespace cocos2d; +USING_NS_CC; using namespace cocostudio; +using namespace cocostudio::timeline; CocoStudioActionTimelineTests::CocoStudioActionTimelineTests() { diff --git a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h index 9994413792..0cc2f6c219 100644 --- a/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h +++ b/tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h @@ -46,7 +46,7 @@ public: void onTouchesEnded(const std::vector& touches, cocos2d::Event* event); protected: - ActionTimeline* action; + cocostudio::timeline::ActionTimeline* action; }; class TestTimelineFrameEvent : public ActionTimelineBaseTest @@ -57,7 +57,7 @@ public: virtual void onEnter() override; virtual std::string title() const override; - void onFrameEvent(Frame* frame); + void onFrameEvent(cocostudio::timeline::Frame* frame); }; class TestTimelinePerformance : public ActionTimelineBaseTest