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

Use make_intrusive/make_shared for smart pointer construction.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-23 23:51:34 +02:00
parent 815df01ba5
commit 708b4389a0
67 changed files with 313 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/regex.cpp
+5 -5
View File
@@ -53,7 +53,7 @@ ScriptRegexP regex_from_script(const ScriptValueP& value) {
ScriptRegexP regex = dynamic_pointer_cast<ScriptRegex>(value);
if (!regex) {
// TODO: introduce some kind of caching?
regex = intrusive(new ScriptRegex(*value));
regex = make_intrusive<ScriptRegex>(*value);
}
return regex;
}
@@ -251,8 +251,8 @@ void init_script_regex_functions(Context& ctx) {
ctx.setVariable(_("split_text"), script_split_text);
ctx.setVariable(_("match_text"), script_match_text);
ctx.setVariable(_("match"), script_match_text); // old name
ctx.setVariable(_("replace_rule"), intrusive(new ScriptRule(script_replace_text)));
ctx.setVariable(_("filter_rule"), intrusive(new ScriptRule(script_filter_text)));
ctx.setVariable(_("break_rule"), intrusive(new ScriptRule(script_break_text)));
ctx.setVariable(_("match_rule"), intrusive(new ScriptRule(script_match_text)));
ctx.setVariable(_("replace_rule"), make_intrusive<ScriptRule>(script_replace_text));
ctx.setVariable(_("filter_rule"), make_intrusive<ScriptRule>(script_filter_text));
ctx.setVariable(_("break_rule"), make_intrusive<ScriptRule>(script_break_text));
ctx.setVariable(_("match_rule"), make_intrusive<ScriptRule>(script_match_text));
}