BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-16 14:08:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix gcc 4.9 compilation

Browse Source
This commit is contained in:
Matvey Cherevko
2019-03-08 11:26:14 +07:00
parent f3302b648b
commit b718bf0b25
10 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headers/enduro2d/high/assets/binary_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class binary_asset final : public content_asset<binary_asset, buffer> {
public:
using content_asset<binary_asset, buffer>::content_asset;
binary_asset(content_type content)
: content_asset<binary_asset, buffer>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/image_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class image_asset final : public content_asset<image_asset, image> {
public:
using content_asset<image_asset, image>::content_asset;
image_asset(content_type content)
: content_asset<image_asset, image>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/material_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class material_asset final : public content_asset<material_asset, render::material> {
public:
using content_asset<material_asset, render::material>::content_asset;
material_asset(content_type content)
: content_asset<material_asset, render::material>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/mesh_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class mesh_asset final : public content_asset<mesh_asset, mesh> {
public:
using content_asset<mesh_asset, mesh>::content_asset;
mesh_asset(content_type content)
: content_asset<mesh_asset, mesh>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/model_asset.hpp
View File

@@ -15,7 +15,8 @@ namespace e2d
{
class model_asset final : public content_asset<model_asset, model> {
public:
using content_asset<model_asset, model>::content_asset;
model_asset(content_type content)
: content_asset<model_asset, model>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/shader_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class shader_asset final : public content_asset<shader_asset, shader_ptr> {
public:
using content_asset<shader_asset, shader_ptr>::content_asset;
shader_asset(content_type content)
: content_asset<shader_asset, shader_ptr>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/sprite_asset.hpp
View File

@@ -15,7 +15,8 @@ namespace e2d
{
class sprite_asset final : public content_asset<sprite_asset, sprite> {
public:
using content_asset<sprite_asset, sprite>::content_asset;
sprite_asset(content_type content)
: content_asset<sprite_asset, sprite>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/text_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class text_asset final : public content_asset<text_asset, str> {
public:
using content_asset<text_asset, str>::content_asset;
text_asset(content_type content)
: content_asset<text_asset, str>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

3
headers/enduro2d/high/assets/texture_asset.hpp
View File

@@ -13,7 +13,8 @@ namespace e2d
{
class texture_asset final : public content_asset<texture_asset, texture_ptr> {
public:
using content_asset<texture_asset, texture_ptr>::content_asset;
texture_asset(content_type content)
: content_asset<texture_asset, texture_ptr>(std::move(content)) {}
static load_async_result load_async(library& library, str_view address);
};
}

2
headers/enduro2d/high/library.hpp
View File

@@ -57,8 +57,6 @@ namespace e2d
using load_result = intrusive_ptr<Asset>;
using load_async_result = stdex::promise<load_result>;
public:
~content_asset() noexcept override = default;
static load_result create(Content content) {
return load_result(new Asset(std::move(content)));
}