From 62256e2ba5d11a8df18058e262beaf9946fe7c0e Mon Sep 17 00:00:00 2001 From: Adam Baratz Date: Tue, 19 Apr 2016 15:35:13 -0400 Subject: [PATCH] Use macro that will automatically get value of indirect zvals --- mustache_data.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mustache_data.cpp b/mustache_data.cpp index a3da90f..f9c09d1 100644 --- a/mustache_data.cpp +++ b/mustache_data.cpp @@ -265,7 +265,7 @@ static zend_always_inline void mustache_data_from_array_zval(mustache::Data * no } data_count = zend_hash_num_elements(data_hash); - ZEND_HASH_FOREACH_KEY_VAL(data_hash, key_nindex, key, data_entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(data_hash, key_nindex, key, data_entry) { if( !key ) { if( node->type == mustache::Data::TypeNone ) { node->init(mustache::Data::TypeArray, data_count); @@ -412,7 +412,7 @@ static zend_always_inline void mustache_data_from_object_properties_zval(mustach return; } - ZEND_HASH_FOREACH_KEY_VAL(data_hash, key_nindex, key, data_entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(data_hash, key_nindex, key, data_entry) { if( key && ZSTR_LEN(key) && ZSTR_VAL(key)[0] ) { // skip private/protected prop_name = ZSTR_VAL(key); @@ -511,7 +511,7 @@ static zend_always_inline void mustache_data_from_object_functions_zval(mustache return; } - ZEND_HASH_FOREACH_KEY_VAL(data_hash, key_nindex, key, data_entry) { + ZEND_HASH_FOREACH_KEY_VAL_IND(data_hash, key_nindex, key, data_entry) { function_entry = (zend_function *) Z_PTR_P(data_entry); if( is_valid_function(function_entry) ) { node->type = mustache::Data::TypeMap;