amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 21:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use std::enable_shared_from_this instead of thisP parameters.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-06 22:59:10 +02:00
parent b4435e5e57
commit e005d47d56
20 changed files with 114 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/dependency.cpp
+3 -3
View File
@@ -49,8 +49,8 @@ public:
ScriptValueP dependencies(Context& ctx, const Dependency& dep) const override {
return unified( a->dependencies(ctx,dep), b->dependencies(ctx,dep));
}
ScriptValueP makeIterator(const ScriptValueP& thisP) const override {
return unified(a->makeIterator(a), b->makeIterator(b));
ScriptValueP makeIterator() const override {
return unified(a->makeIterator(), b->makeIterator());
}
ScriptValueP dependencyMember(const String& name, const Dependency& dep) const override {
return unified(a->dependencyMember(name,dep), b->dependencyMember(name,dep));
@@ -307,7 +307,7 @@ ScriptValueP Context::dependencies(const Dependency& dep, const Script& script)
ScriptValueP& a = stack.back();
switch (i.instr1) {
case I_ITERATOR_C:
a = a->makeIterator(a); // as normal
a = a->makeIterator(); // as normal
break;
default:
a = dependency_dummy;