From 7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 18 Mar 2010 14:35:09 +0100 Subject: [PATCH] c++ wrapper: add missing 'inline' statements to various constructors the missing 'inline' leads to duplicated symbols if the header is included into two separately compiled files. --- src/jansson.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jansson.hpp b/src/jansson.hpp index efb4b52..c8db40d 100644 --- a/src/jansson.hpp +++ b/src/jansson.hpp @@ -166,9 +166,9 @@ namespace json { // proxies an array element class ElementProxy { public: - ElementProxy(json_t* array, unsigned int index); - ElementProxy(const ElementProxy& other); - ~ElementProxy(); + inline ElementProxy(json_t* array, unsigned int index); + inline ElementProxy(const ElementProxy& other); + inline ~ElementProxy(); // assign to the proxied element inline ElementProxy& operator=(const Value& value); @@ -187,9 +187,9 @@ namespace json { // proxies an object property class PropertyProxy { public: - PropertyProxy(json_t* object, const char *key); - PropertyProxy(const PropertyProxy& other); - ~PropertyProxy(); + inline PropertyProxy(json_t* object, const char *key); + inline PropertyProxy(const PropertyProxy& other); + inline ~PropertyProxy(); // assign to the proxied element inline PropertyProxy& operator=(const Value& value); -- 2.1.4