Index: ps/trunk/libraries/source/fcollada/build.sh =================================================================== --- ps/trunk/libraries/source/fcollada/build.sh +++ ps/trunk/libraries/source/fcollada/build.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -LIB_VERSION="fcollada-3.05+wildfiregames.3" +LIB_VERSION="fcollada-3.05+wildfiregames.4" JOBS=${JOBS:="-j2"} MAKE=${MAKE:="make"} LDFLAGS=${LDFLAGS:=""} Index: ps/trunk/libraries/source/fcollada/include/FUtils/FUTracker.h =================================================================== --- ps/trunk/libraries/source/fcollada/include/FUtils/FUTracker.h +++ ps/trunk/libraries/source/fcollada/include/FUtils/FUTracker.h @@ -2,7 +2,7 @@ Copyright (C) 2005-2007 Feeling Software Inc. Portions of the code are: Copyright (C) 2005-2007 Sony Computer Entertainment America - + MIT License: http://www.opensource.org/licenses/mit-license.php */ @@ -114,20 +114,20 @@ public: /** Copy constructor. - @param _ptr The object to track. This pointer can be NULL to indicate + @param pObj The object to track. This pointer can be NULL to indicate that no object should be tracked at this time. */ - FUTrackedPtr(ObjectClass* _ptr = NULL) : ptr(_ptr) + FUTrackedPtr(ObjectClass* pObj = nullptr) : ptr(pObj) { - if (ptr != NULL) FUTracker::TrackObject((FUTrackable*) ptr); - ptr = ptr; + if (pObj != nullptr) + FUTracker::TrackObject(static_cast(pObj)); } /** Destructor. Stops the tracking of the pointer. */ ~FUTrackedPtr() { - if (ptr != NULL) FUTracker::UntrackObject((FUTrackable*) ptr); - ptr = NULL; + if (ptr != nullptr) FUTracker::UntrackObject((FUTrackable*) ptr); + ptr = nullptr; } /** Assigns this tracking pointer a new object to track. @@ -195,7 +195,7 @@ } Parent::clear(); } - + /** Retrieves the first element of the container. @return The first element in the container. */ ObjectClass*& front() { return (ObjectClass*&) Parent::front(); } @@ -218,12 +218,12 @@ @return an iterator for the first element in the list. */ inline iterator begin() { return (iterator) Parent::begin(); } inline const_iterator begin() const { return (const_iterator) Parent::begin(); } /**< See above. */ - + /** Retrieves an iterator for the element after the last element in the list. @return an iterator for the element after the last element in the list. */ inline iterator end() { return (iterator) Parent::end(); } inline const_iterator end() const { return (const_iterator) Parent::end(); } /**< See above. */ - + /** Retrieves an iterator for a given element in the list. @param item An item of the list. @return An iterator for the given item. If the item is not @@ -286,7 +286,7 @@ Parent::pop_back(); } } - + /** Removes the value at the given position within the list. @param _it The list position for the value to remove. */ iterator erase(iterator _it) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDAnimation.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDAnimation.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDAnimation.cpp @@ -117,7 +117,7 @@ void FCDAnimation::GetCurves(FCDAnimationCurveList& curves) { // Retrieve the curves for this animation tree element - for (const FCDAnimationChannel** it = (const FCDAnimationChannel**) channels.begin(); it != channels.end(); ++it) + for (const FCDAnimationChannel* const* it = channels.begin(); it != channels.end(); ++it) { size_t channelCurveCount = (*it)->GetCurveCount(); for (size_t i = 0; i < channelCurveCount; ++i) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDControllerInstance.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDControllerInstance.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDControllerInstance.cpp @@ -54,7 +54,7 @@ { skeletonRoots.clear(); - for (const FCDSceneNode** itJ = (const FCDSceneNode**) joints.begin(); itJ != joints.end(); ++itJ) + for (const FCDSceneNode* const* itJ = joints.begin(); itJ != joints.end(); ++itJ) { const FCDSceneNode* joint = (*itJ); if (joint == NULL) continue; Index: ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDExtra.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDExtra.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDExtra.cpp @@ -234,7 +234,7 @@ void FCDENode::FindParameters(FCDENodeList& nodes, StringList& names) { - for (const FCDENode** itN = (const FCDENode**) children.begin(); itN != children.end(); ++itN) + for (const FCDENode* const* itN = children.begin(); itN != children.end(); ++itN) { const FCDENode* node = (*itN); if (node->GetChildNodeCount() == 0) Index: ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDMaterialInstance.cpp =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDMaterialInstance.cpp +++ ps/trunk/libraries/source/fcollada/src/FCollada/FCDocument/FCDMaterialInstance.cpp @@ -116,7 +116,7 @@ const FCDMaterialInstanceBind* FCDMaterialInstance::FindBinding(const char* semantic) { - for (const FCDMaterialInstanceBind** it = (const FCDMaterialInstanceBind**) bindings.begin(); it != bindings.end(); ++it) + for (const FCDMaterialInstanceBind* const* it = bindings.begin(); it != bindings.end(); ++it) { if (IsEquivalent((*it)->semantic, semantic)) return (*it); } Index: ps/trunk/libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h =================================================================== --- ps/trunk/libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h +++ ps/trunk/libraries/source/fcollada/src/FCollada/FUtils/FUTracker.h @@ -2,7 +2,7 @@ Copyright (C) 2005-2007 Feeling Software Inc. Portions of the code are: Copyright (C) 2005-2007 Sony Computer Entertainment America - + MIT License: http://www.opensource.org/licenses/mit-license.php */ @@ -114,20 +114,20 @@ public: /** Copy constructor. - @param _ptr The object to track. This pointer can be NULL to indicate + @param pObj The object to track. This pointer can be NULL to indicate that no object should be tracked at this time. */ - FUTrackedPtr(ObjectClass* _ptr = NULL) : ptr(_ptr) + FUTrackedPtr(ObjectClass* pObj = nullptr) : ptr(pObj) { - if (ptr != NULL) FUTracker::TrackObject((FUTrackable*) ptr); - ptr = ptr; + if (pObj != nullptr) + FUTracker::TrackObject(static_cast(pObj)); } /** Destructor. Stops the tracking of the pointer. */ ~FUTrackedPtr() { - if (ptr != NULL) FUTracker::UntrackObject((FUTrackable*) ptr); - ptr = NULL; + if (ptr != nullptr) FUTracker::UntrackObject((FUTrackable*) ptr); + ptr = nullptr; } /** Assigns this tracking pointer a new object to track. @@ -195,7 +195,7 @@ } Parent::clear(); } - + /** Retrieves the first element of the container. @return The first element in the container. */ ObjectClass*& front() { return (ObjectClass*&) Parent::front(); } @@ -218,12 +218,12 @@ @return an iterator for the first element in the list. */ inline iterator begin() { return (iterator) Parent::begin(); } inline const_iterator begin() const { return (const_iterator) Parent::begin(); } /**< See above. */ - + /** Retrieves an iterator for the element after the last element in the list. @return an iterator for the element after the last element in the list. */ inline iterator end() { return (iterator) Parent::end(); } inline const_iterator end() const { return (const_iterator) Parent::end(); } /**< See above. */ - + /** Retrieves an iterator for a given element in the list. @param item An item of the list. @return An iterator for the given item. If the item is not @@ -286,7 +286,7 @@ Parent::pop_back(); } } - + /** Removes the value at the given position within the list. @param _it The list position for the value to remove. */ iterator erase(iterator _it)