summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-16 15:22:00 +0100
committerEmiel Bruijntjes <emiel.bruijntjes@copernica.com>2014-03-16 15:22:00 +0100
commit03a2749a311c75e0f34070b2d6f991855f329fc9 (patch)
tree523c02dac35c3f11c43500c8337a5e259a4733b7
parentb535eb72dcf1ee37686003b92b07b070be5e8e75 (diff)
removed Value constructor that wraps around a hash table
-rw-r--r--include/value.h8
-rw-r--r--src/value.cpp18
2 files changed, 2 insertions, 24 deletions
diff --git a/include/value.h b/include/value.h
index 94cc1cf..d49ce4a 100644
--- a/include/value.h
+++ b/include/value.h
@@ -113,12 +113,6 @@ public:
Value(struct _zval_struct *zval, bool ref = false);
/**
- * Wrap around a hash table
- * @param ht Hashtable to wrap
- */
- Value(struct _hashtable *ht);
-
- /**
* Wrap around an object implemented by us
* @param object Object to be wrapped
*/
@@ -445,6 +439,8 @@ public:
template <typename T>
std::vector<T> vectorValue() const
{
+
+
// only works for arrays, other types return an empty vector
if (!isArray()) return std::vector<T>();
diff --git a/src/value.cpp b/src/value.cpp
index a041967..356df4a 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -170,22 +170,6 @@ Value::Value(struct _zval_struct *val, bool ref)
}
/**
- * Wrap around a hash table
- * @param ht Hashtable to wrap
- */
-Value::Value(HashTable *ht)
-{
- // construct a zval
- MAKE_STD_ZVAL(_val);
- Z_ARRVAL_P(_val) = ht;
- Z_TYPE_P(_val) = IS_ARRAY;
-
- // add a reference
- // @todo this may be wrong
- Z_ADDREF_P(_val);
-}
-
-/**
* Wrap around an object
* @param object
*/
@@ -1572,8 +1556,6 @@ ValueIterator Value::begin() const
if (isObject()) return ValueIterator(Z_OBJ_HT_P(_val)->get_properties(_val), true);
// invalid
- // @todo fix iterators without a hashtable
- // @todo test Php::empty() function
return ValueIterator(nullptr,true);
}