From 1d7006c420b39ac1a63f6e5c33a2605191b7e246 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Fri, 24 Feb 2017 11:43:05 +0100 Subject: [PATCH] [Utils] Inline array merging --- src/Utils/Utils.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Utils/Utils.hpp b/src/Utils/Utils.hpp index 13b25be9..130075ba 100644 --- a/src/Utils/Utils.hpp +++ b/src/Utils/Utils.hpp @@ -9,7 +9,7 @@ namespace Utils bool IsWineEnvironment(); - template void Merge(std::vector* target, T* source, size_t length) + template inline void Merge(std::vector* target, T* source, size_t length) { if (source) { @@ -20,7 +20,7 @@ namespace Utils } } - template void Merge(std::vector* target, std::vector source) + template inline void Merge(std::vector* target, std::vector source) { for (auto &entry : source) {