BlackMATov/ecs.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/ecs.hpp.git synced 2025-12-14 10:58:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from BlackMATov/dev

Browse Source 
Dev
This commit is contained in:
BlackMat MATov
2019-04-12 05:19:25 +07:00
committed by GitHub
parent 16eea3ed70 bc5d473110
commit db74d8a6cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ecs.hpp
View File

@@ -1797,7 +1797,7 @@ namespace ecs_hpp
return std::move(*this);
}
prototype& prototype::merge(const prototype& other, bool override) & {
inline prototype& prototype::merge(const prototype& other, bool override) & {
for ( const auto family_id : other.appliers_ ) {
if ( override || !appliers_.has(family_id) ) {
appliers_.insert_or_assign(
@@ -1808,7 +1808,7 @@ namespace ecs_hpp
return *this;
}
prototype&& prototype::merge(const prototype& other, bool override) && {
inline prototype&& prototype::merge(const prototype& other, bool override) && {
merge(other, override);
return std::move(*this);
}