From eaf9912741b6b3d35aa5c33170b9f060ded9bc42 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:41:53 +0500 Subject: Fixed linux compilation errors --- src/AssetManager.cpp | 9 ++++++--- src/AssetManager.hpp | 1 + src/TextureAtlas.hpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/AssetManager.cpp b/src/AssetManager.cpp index 6d0f33f..aa796b8 100644 --- a/src/AssetManager.cpp +++ b/src/AssetManager.cpp @@ -151,7 +151,8 @@ void ParseAssetTexture(AssetTreeNode &node) { stbi_image_free(data); - node.data.swap(std::vector()); + node.data.clear(); + node.data.shrink_to_fit(); } void ParseAssetBlockModel(AssetTreeNode &node) { @@ -284,7 +285,8 @@ void ParseAssetBlockModel(AssetTreeNode &node) { node.asset = std::make_unique(); dynamic_cast(node.asset.get())->blockModel = model; - node.data.swap(std::vector()); + node.data.clear(); + node.data.shrink_to_fit(); } void ParseAssetBlockState(AssetTreeNode &node) { @@ -333,7 +335,8 @@ void ParseAssetBlockState(AssetTreeNode &node) { AssetBlockState *asset = dynamic_cast(node.asset.get()); asset->blockState = blockState; - node.data.swap(std::vector()); + node.data.clear(); + node.data.shrink_to_fit(); } void ParseBlockModels() { diff --git a/src/AssetManager.hpp b/src/AssetManager.hpp index 5d86d9c..3ecff25 100644 --- a/src/AssetManager.hpp +++ b/src/AssetManager.hpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/src/TextureAtlas.hpp b/src/TextureAtlas.hpp index 76a6c49..1e5c134 100644 --- a/src/TextureAtlas.hpp +++ b/src/TextureAtlas.hpp @@ -2,7 +2,7 @@ #include -#include +#include struct TextureData { std::vector data; //expected format RGBA8888 -- cgit v1.2.3