Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #4729: don't use 'using namespace std;'

This commit is contained in:
James Chen 2014-04-09 22:46:41 +08:00
parent e59374de81
commit 377086d67a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp
View File

@ -4,11 +4,13 @@
#include "CCBReader.h" #include "CCBReader.h"
#include "CCBKeyframe.h" #include "CCBKeyframe.h"
#include "CCNode+CCBRelativePositioning.h" #include "CCNode+CCBRelativePositioning.h"
#include <string>
#include <set>
#include "SimpleAudioEngine.h" #include "SimpleAudioEngine.h"
#include "CCBSelectorResolver.h" #include "CCBSelectorResolver.h"
#include <string>
#include <sstream>
#include <set>
using namespace cocos2d; using namespace cocos2d;
using namespace std; using namespace std;
using namespace cocos2d::extension; using namespace cocos2d::extension;

12
cocos/editor-support/cocosbuilder/CCBReader.cpp
View File

@ -16,14 +16,12 @@
#include "CCBAnimationManager.h" #include "CCBAnimationManager.h"
#include "CCBSequenceProperty.h" #include "CCBSequenceProperty.h"
#include "CCBKeyframe.h" #include "CCBKeyframe.h"
#include <sstream>
using namespace std;
using namespace cocos2d; using namespace cocos2d;
using namespace cocos2d::extension; using namespace cocos2d::extension;
namespace cocosbuilder {; namespace cocosbuilder {
/************************************************************************* /*************************************************************************
Implementation of CCBFile Implementation of CCBFile
@ -182,12 +180,12 @@ CCBSelectorResolver * CCBReader::getCCBSelectorResolver() {
return this->_CCBSelectorResolver; return this->_CCBSelectorResolver;
} }
set<string>* CCBReader::getAnimatedProperties() std::set<std::string>* CCBReader::getAnimatedProperties()
{ {
return _animatedProps; return _animatedProps;
} }
set<string>& CCBReader::getLoadedSpriteSheet() std::set<std::string>& CCBReader::getLoadedSpriteSheet()
{ {
return _loadedSpriteSheets; return _loadedSpriteSheets;
} }
@ -551,7 +549,7 @@ Node * CCBReader::readNodeGraph(Node * pParent)
// Read animated properties // Read animated properties
std::unordered_map<int, Map<std::string, CCBSequenceProperty*>> seqs; std::unordered_map<int, Map<std::string, CCBSequenceProperty*>> seqs;
_animatedProps = new set<string>(); _animatedProps = new std::set<std::string>();
int numSequence = readInt(false); int numSequence = readInt(false);
for (int i = 0; i < numSequence; ++i) for (int i = 0; i < numSequence; ++i)