Merge pull request #5046 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
This commit is contained in:
Walter Bright 2017-01-21 15:45:48 -08:00 committed by GitHub
commit 9f77f47cc7
2 changed files with 22 additions and 4 deletions

View file

@ -2387,6 +2387,11 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
else
_current = _items.front;
};
this(RoR items, ElementType!RoR current)
{
_items = items;
_current = current;
}
public:
this(RoR r)
{
@ -2441,10 +2446,7 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
{
@property auto save()
{
Result copy = this;
copy._items = _items.save;
copy._current = _current.save;
return copy;
return Result(_items.save, _current.save);
}
}