aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2010-03-18 14:35:09 +0100
committerAndres Freund <andres@anarazel.de>2010-03-18 14:35:09 +0100
commit7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d (patch)
treedb6dd597fbdecff0f7829435a70f660d631e6661
parent42621370c3b562dff33cd8a8a043cb7bd519d4a6 (diff)
downloadjansson-7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d.zip
jansson-7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d.tar.gz
jansson-7d5982e6fe4c65cdb6961d722d7e1e00ca45d40d.tar.bz2
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.
-rw-r--r--src/jansson.hpp12
1 files 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);