From: Andres Freund <andres@anarazel.de>
Date: Thu, 18 Mar 2010 13:35:09 +0000 (+0100)
Subject: c++ wrapper: add missing 'inline' statements to various constructors
X-Git-Tag: v1.3~9
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d

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.
---

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);