From 9ec1e2069a0cbe9794c32c5a1b78aaba7f8ee8b0 Mon Sep 17 00:00:00 2001 From: mogemimi Date: Fri, 13 Nov 2015 14:38:48 +0900 Subject: [PATCH] Fix deprecated warnings --- cocos/editor-support/cocostudio/CCArmatureDataManager.cpp | 4 ++-- .../WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp index d0d7639a6e..5638bbbbb9 100644 --- a/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp +++ b/cocos/editor-support/cocostudio/CCArmatureDataManager.cpp @@ -250,7 +250,7 @@ const cocos2d::Map& ArmatureDataManager::getTextureDa return _textureDatas; } -void CCArmatureDataManager::addRelativeData(const std::string& configFilePath) +void ArmatureDataManager::addRelativeData(const std::string& configFilePath) { if (_relativeDatas.find(configFilePath) == _relativeDatas.end()) { @@ -258,7 +258,7 @@ void CCArmatureDataManager::addRelativeData(const std::string& configFilePath) } } -RelativeData *CCArmatureDataManager::getRelativeData(const std::string& configFilePath) +RelativeData *ArmatureDataManager::getRelativeData(const std::string& configFilePath) { return &_relativeDatas[configFilePath]; } diff --git a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp index 27ff13c4cf..4c2eeda87b 100644 --- a/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp +++ b/cocos/editor-support/cocostudio/WidgetReader/ArmatureNodeReader/ArmatureNodeReader.cpp @@ -165,7 +165,7 @@ void ArmatureNodeReader::setPropsWithFlatBuffers(cocos2d::Node *node, cocos2d::Node* ArmatureNodeReader::createNodeWithFlatBuffers(const flatbuffers::Table *nodeOptions) { - auto node = CCArmature::create(); + auto node = Armature::create(); // self auto options = (flatbuffers::CSArmatureNodeOption*)nodeOptions;