From 1662ebea4faf57a26415d1414981d5f43e5e9b27 Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 26 Aug 2020 16:12:42 +0200 Subject: [PATCH] [cpp] Closes #1736, remove nullptr usage. --- spine-cpp/spine-cpp/src/spine/Json.cpp | 2 +- spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/Json.cpp b/spine-cpp/spine-cpp/src/spine/Json.cpp index daf82e490..f654e6b67 100644 --- a/spine-cpp/spine-cpp/src/spine/Json.cpp +++ b/spine-cpp/spine-cpp/src/spine/Json.cpp @@ -120,7 +120,7 @@ Json::Json(const char *value) : } Json::~Json() { - spine::Json* curr = nullptr; + spine::Json* curr = NULL; spine::Json* next = _child; do { curr = next; diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index fd266ee1b..5ba11f662 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -380,7 +380,7 @@ char *SkeletonBinary::readString(DataInput *input) { char* SkeletonBinary::readStringRef(DataInput* input, SkeletonData* skeletonData) { int index = readVarint(input, true); - return index == 0 ? nullptr : skeletonData->_strings[index - 1]; + return index == 0 ? NULL : skeletonData->_strings[index - 1]; } float SkeletonBinary::readFloat(DataInput *input) {