diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp index 53507b16ec..7c914765f0 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp @@ -4,11 +4,13 @@ #include "CCBReader.h" #include "CCBKeyframe.h" #include "CCNode+CCBRelativePositioning.h" -#include -#include #include "SimpleAudioEngine.h" #include "CCBSelectorResolver.h" +#include +#include +#include + using namespace cocos2d; using namespace std; using namespace cocos2d::extension; diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp index c915518788..ff535a213c 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp @@ -16,14 +16,12 @@ #include "CCBAnimationManager.h" #include "CCBSequenceProperty.h" #include "CCBKeyframe.h" +#include - - -using namespace std; using namespace cocos2d; using namespace cocos2d::extension; -namespace cocosbuilder {; +namespace cocosbuilder { /************************************************************************* Implementation of CCBFile @@ -182,12 +180,12 @@ CCBSelectorResolver * CCBReader::getCCBSelectorResolver() { return this->_CCBSelectorResolver; } -set* CCBReader::getAnimatedProperties() +std::set* CCBReader::getAnimatedProperties() { return _animatedProps; } -set& CCBReader::getLoadedSpriteSheet() +std::set& CCBReader::getLoadedSpriteSheet() { return _loadedSpriteSheets; } @@ -551,7 +549,7 @@ Node * CCBReader::readNodeGraph(Node * pParent) // Read animated properties std::unordered_map> seqs; - _animatedProps = new set(); + _animatedProps = new std::set(); int numSequence = readInt(false); for (int i = 0; i < numSequence; ++i)