diff options
Diffstat (limited to 'src/tag/Tag.hxx')
| -rw-r--r-- | src/tag/Tag.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx index 5b3b59ec8..fca5ea284 100644 --- a/src/tag/Tag.hxx +++ b/src/tag/Tag.hxx @@ -117,8 +117,11 @@ struct Tag { * * @return a newly allocated tag */ - static std::unique_ptr<Tag> Merge(const Tag &base, - const Tag &add) noexcept; + static Tag Merge(const Tag &base, + const Tag &add) noexcept; + + static std::unique_ptr<Tag> MergePtr(const Tag &base, + const Tag &add) noexcept; /** * Merges the data from two tags. Any of the two may be nullptr. Both |