From f06cb132a33ea6d8faaa0dbe667a1928023ee013 Mon Sep 17 00:00:00 2001 From: Kiith-Sa Date: Thu, 27 Dec 2012 22:00:31 +0100 Subject: [PATCH] dyaml.node.merge() usage fix. --- dyaml/composer.d | 6 +++++- dyaml/node.d | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dyaml/composer.d b/dyaml/composer.d index 42fd448..e42b374 100644 --- a/dyaml/composer.d +++ b/dyaml/composer.d @@ -262,7 +262,11 @@ final class Composer foreach(ref Node key, ref Node value; root) { if(key.isType!YAMLMerge){toMerge ~= value;} - else{merge(result, Node.Pair(key, value));} + else + { + auto temp = Node.Pair(key, value); + merge(result, temp); + } } foreach(node; toMerge) { diff --git a/dyaml/node.d b/dyaml/node.d index 09778fd..5a7a375 100644 --- a/dyaml/node.d +++ b/dyaml/node.d @@ -17,7 +17,7 @@ import std.datetime; import std.exception; import std.math; import std.range; -import std.stdio; +import std.stdio; import std.string; import std.traits; import std.typecons; @@ -1779,7 +1779,7 @@ package: * Params: pairs = Array of pairs to merge into. * toMerge = Pair to merge. */ -void merge(ref Node.Pair[] pairs, ref Node.Pair toMerge) @safe +void merge(ref Node.Pair[] pairs, ref Node.Pair toMerge) @safe { foreach(ref pair; pairs) {