common/JsonUtil.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5736f4c307054055aebb136b8e0d2cb1c3c1edb8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Mar 19 11:58:03 2018 +0100
common: mark parseJSON() as inline explicitly
Otherwise this can lead to an ODR violation.
Change-Id: I1b195cb57d37a050755d7d3f6c922950ef8738c4
diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp
index fe63a469b..057344ec5 100644
--- a/common/JsonUtil.hpp
+++ b/common/JsonUtil.hpp
@@ -25,7 +25,7 @@ namespace JsonUtil
// Parse the json string and fill the Poco::JSON object
// Returns true if parsing successful otherwise false
-bool parseJSON(const std::string& json, Poco::JSON::Object::Ptr& object)
+inline bool parseJSON(const std::string& json, Poco::JSON::Object::Ptr& object)
{
bool success = false;
const size_t index = json.find_first_of('{');
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
