From e4cce48e293a225d25a7addc10f64fe10df2c45a Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 27 Jun 2018 15:15:14 +0200 Subject: [PATCH] Minor cleanup. --- spine-sfml/cpp/example/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spine-sfml/cpp/example/main.cpp b/spine-sfml/cpp/example/main.cpp index ecb3b7a8d..44fd30bfd 100644 --- a/spine-sfml/cpp/example/main.cpp +++ b/spine-sfml/cpp/example/main.cpp @@ -38,8 +38,8 @@ using namespace spine; #include template -std::unique_ptr make_unique(Args&&... args) { - return std::unique_ptr(new T(std::forward(args)...)); +unique_ptr make_unique(Args&&... args) { + return unique_ptr(new T(forward(args)...)); } void callback (AnimationState* state, EventType type, TrackEntry* entry, Event* event) { @@ -69,26 +69,26 @@ void callback (AnimationState* state, EventType type, TrackEntry* entry, Event* fflush(stdout); } -SkeletonData* readSkeletonJsonData (const String& filename, Atlas* atlas, float scale) { +shared_ptr readSkeletonJsonData (const String& filename, Atlas* atlas, float scale) { SkeletonJson json(atlas); json.setScale(scale); - SkeletonData* skeletonData = json.readSkeletonDataFile(filename); + auto skeletonData = json.readSkeletonDataFile(filename); if (!skeletonData) { printf("%s\n", json.getError().buffer()); exit(0); } - return skeletonData; + return shared_ptr(skeletonData); } -SkeletonData* readSkeletonBinaryData (const char* filename, Atlas* atlas, float scale) { +shared_ptr readSkeletonBinaryData (const char* filename, Atlas* atlas, float scale) { SkeletonBinary binary(atlas); binary.setScale(scale); - SkeletonData *skeletonData = binary.readSkeletonDataFile(filename); + auto skeletonData = binary.readSkeletonDataFile(filename); if (!skeletonData) { printf("%s\n", binary.getError().buffer()); exit(0); } - return skeletonData; + return shared_ptr(skeletonData); } void testcase (void func(SkeletonData* skeletonData, Atlas* atlas), @@ -97,10 +97,10 @@ void testcase (void func(SkeletonData* skeletonData, Atlas* atlas), SFMLTextureLoader textureLoader; auto atlas = make_unique(atlasName, &textureLoader); - auto skeletonData = unique_ptr(readSkeletonJsonData(jsonName, atlas.get(), scale)); + auto skeletonData = readSkeletonJsonData(jsonName, atlas.get(), scale); func(skeletonData.get(), atlas.get()); - skeletonData = unique_ptr(readSkeletonBinaryData(binaryName, atlas.get(), scale)); + skeletonData = readSkeletonBinaryData(binaryName, atlas.get(), scale); func(skeletonData.get(), atlas.get()); }