Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

In gcc5 nullptr can't be directly used as bool

Browse source 
See https://gcc.gnu.org/gcc-5/porting_to.html
"Converting std::nullptr_t to bool"
This commit is contained in:
Christoph Haag 2015-09-08 09:44:20 +02:00
parent 670c5ee484
commit fa221fa7e3
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/animation/src/AnimNodeLoader.cpp
View file

@ -75,7 +75,7 @@ static NodeProcessFunc animNodeTypeToProcessFunc(AnimNode::Type type) {
qCCritical(animation) << "AnimNodeLoader, error reading string" \ qCCritical(animation) << "AnimNodeLoader, error reading string" \
<< #NAME << ", id =" << ID \ << #NAME << ", id =" << ID \
<< ", url =" << URL.toDisplayString(); \ << ", url =" << URL.toDisplayString(); \
return nullptr; \ return (bool) nullptr; \
} \ } \
QString NAME = NAME##_VAL.toString() QString NAME = NAME##_VAL.toString()
@ -102,7 +102,7 @@ static NodeProcessFunc animNodeTypeToProcessFunc(AnimNode::Type type) {
qCCritical(animation) << "AnimNodeLoader, error reading double" \ qCCritical(animation) << "AnimNodeLoader, error reading double" \
<< #NAME << "id =" << ID \ << #NAME << "id =" << ID \
<< ", url =" << URL.toDisplayString(); \ << ", url =" << URL.toDisplayString(); \
return nullptr; \ return (bool) nullptr; \
} \ } \
float NAME = (float)NAME##_VAL.toDouble() float NAME = (float)NAME##_VAL.toDouble()
@ -283,7 +283,7 @@ bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj,
auto statesValue = jsonObj.value("states"); auto statesValue = jsonObj.value("states");
if (!statesValue.isArray()) { if (!statesValue.isArray()) {
qCCritical(animation) << "AnimNodeLoader, bad array \"states\" in stateMachine node, id =" << nodeId << ", url =" << jsonUrl.toDisplayString(); qCCritical(animation) << "AnimNodeLoader, bad array \"states\" in stateMachine node, id =" << nodeId << ", url =" << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
// build a map for all children by name. // build a map for all children by name.
@ -302,7 +302,7 @@ bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj,
for (const auto& stateValue : statesArray) { for (const auto& stateValue : statesArray) {
if (!stateValue.isObject()) { if (!stateValue.isObject()) {
qCCritical(animation) << "AnimNodeLoader, bad state object in \"states\", id =" << nodeId << ", url =" << jsonUrl.toDisplayString(); qCCritical(animation) << "AnimNodeLoader, bad state object in \"states\", id =" << nodeId << ", url =" << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
auto stateObj = stateValue.toObject(); auto stateObj = stateValue.toObject();
@ -318,7 +318,7 @@ bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj,
auto iter = childMap.find(stdId); auto iter = childMap.find(stdId);
if (iter == childMap.end()) { if (iter == childMap.end()) {
qCCritical(animation) << "AnimNodeLoader, could not find stateMachine child (state) with nodeId =" << nodeId << "stateId =" << id << "url =" << jsonUrl.toDisplayString(); qCCritical(animation) << "AnimNodeLoader, could not find stateMachine child (state) with nodeId =" << nodeId << "stateId =" << id << "url =" << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
auto statePtr = std::make_shared<AnimStateMachine::State>(stdId, iter->second, interpTarget, interpDuration); auto statePtr = std::make_shared<AnimStateMachine::State>(stdId, iter->second, interpTarget, interpDuration);
@ -337,14 +337,14 @@ bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj,
auto transitionsValue = stateObj.value("transitions"); auto transitionsValue = stateObj.value("transitions");
if (!transitionsValue.isArray()) { if (!transitionsValue.isArray()) {
qCritical(animation) << "AnimNodeLoader, bad array \"transitions\" in stateMachine node, stateId =" << id << "nodeId =" << nodeId << "url =" << jsonUrl.toDisplayString(); qCritical(animation) << "AnimNodeLoader, bad array \"transitions\" in stateMachine node, stateId =" << id << "nodeId =" << nodeId << "url =" << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
auto transitionsArray = transitionsValue.toArray(); auto transitionsArray = transitionsValue.toArray();
for (const auto& transitionValue : transitionsArray) { for (const auto& transitionValue : transitionsArray) {
if (!transitionValue.isObject()) { if (!transitionValue.isObject()) {
qCritical(animation) << "AnimNodeLoader, bad transition object in \"transtions\", stateId =" << id << "nodeId =" << nodeId << "url =" << jsonUrl.toDisplayString(); qCritical(animation) << "AnimNodeLoader, bad transition object in \"transtions\", stateId =" << id << "nodeId =" << nodeId << "url =" << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
auto transitionObj = transitionValue.toObject(); auto transitionObj = transitionValue.toObject();
@ -363,7 +363,7 @@ bool processStateMachineNode(AnimNode::Pointer node, const QJsonObject& jsonObj,
srcState->addTransition(AnimStateMachine::State::Transition(transition.second.first, iter->second)); srcState->addTransition(AnimStateMachine::State::Transition(transition.second.first, iter->second));
} else { } else {
qCCritical(animation) << "AnimNodeLoader, bad state machine transtion from srcState =" << srcState->_id.c_str() << "dstState =" << transition.second.second.c_str() << "nodeId =" << nodeId << "url = " << jsonUrl.toDisplayString(); qCCritical(animation) << "AnimNodeLoader, bad state machine transtion from srcState =" << srcState->_id.c_str() << "dstState =" << transition.second.second.c_str() << "nodeId =" << nodeId << "url = " << jsonUrl.toDisplayString();
return nullptr; return (bool) nullptr;
} }
} }