Merge branch '1.2'

[jansson.git] / src / jansson.hpp

diff --git a/src/jansson.hpp b/src/jansson.hpp
index ad6d177..c8db40d 100644 (file)
--- 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);
@@ -201,6 +201,9 @@ namespace json {
             // array object we wrap
             json_t* _object;
 
+            // iterator pointing to property
+            void* _iter;
+
             // key of property
             char* _key;
         };