Merge branch 'develop' of github.com:andyque/cocos2d-x into develop

This commit is contained in:
andyque 2014-01-03 09:37:15 +08:00
commit 053656fea2
1 changed files with 8 additions and 1 deletions

View File

@ -264,7 +264,14 @@ public:
* which causes an automatic reallocation of the allocated storage space
* if -and only if- the new vector size surpasses the current vector capacity.
*/
void pushBack(T object)
void pushBack(const T& object)
{
CCASSERT(object != nullptr, "The object should not be nullptr");
_data.push_back( object );
object->retain();
}
void pushBack(T&& object)
{
CCASSERT(object != nullptr, "The object should not be nullptr");
_data.push_back( object );