From 2c484adbab9255498953739cb4d9751353cc804d Mon Sep 17 00:00:00 2001
From: Emiel Bruijntjes <emiel.bruijntjes@copernica.com>
Date: Sat, 8 Mar 2014 13:51:08 +0100
Subject: various fixes to make the function call example compilable

---
 include/array.h     |  6 ++++++
 include/classbase.h |  2 +-
 include/value.h     | 29 ++++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/array.h b/include/array.h
index 3b92826..dcd5e5f 100644
--- a/include/array.h
+++ b/include/array.h
@@ -58,6 +58,12 @@ public:
     template <typename T>
     Array(const std::map<std::string,T> &value) : Value(value) {}
     
+    /**
+     *  Constructor from an initializer list
+     *  @param  value
+     */
+    Array(const std::initializer_list<Value> &value) : Value(value) {}
+    
     /**
      *  Destructor
      */
diff --git a/include/classbase.h b/include/classbase.h
index 05ab2f4..25d081f 100644
--- a/include/classbase.h
+++ b/include/classbase.h
@@ -240,7 +240,7 @@ private:
      *  @param  count
      *  @return int
      */
-    static int countElements(zval *object, long *count TSRMLS_DC);
+    static int countElements(struct _zval *object, long *count);
 
     /**
      *  Retrieve pointer to our own object handlers
diff --git a/include/value.h b/include/value.h
index 5800c6a..72bd895 100644
--- a/include/value.h
+++ b/include/value.h
@@ -72,8 +72,25 @@ public:
     template <typename T>
     Value(const std::vector<T> &input) : Value(Type::Array)
     {
+        // index
+        int i = 0;
+        
+        // set all elements
+        for (auto &elem : input) setRaw(i++, elem);
+    }
+
+    /**
+     *  Constructor from an initializer list
+     *  @param  value
+     */
+    template <typename T>
+    Value(const std::initializer_list<T> &value) : Value(Type::Array) 
+    {
+        // index
+        int i = 0;
+
         // set all elements
-        for (size_t i=0; i<input.size(); i++) setRaw(i, input[i]);
+        for (auto &elem : value) setRaw(i++, elem);
     }
     
     /**
@@ -395,8 +412,14 @@ public:
         // and fill the result vector
         for (size_t i = 0; i<count; i++) 
         {
-            // check if the index exists, then add it
-            if (contains(i)) result.push_back((T)get(i));
+            // check if the index exists
+            if (!contains(i)) continue;
+            
+            // get the value object
+            Value value(get(i));
+            
+            // add it to the vector
+            result.push_back(value);
         }
         
         // done
-- 
cgit v1.2.3