com php-src: C++ compiler doesn't allow cast a void * to other pointer type: Zend/zend_execute.h Zend/zend_string.h
| From: | Xinchen Hui | Date: | Fri, 27 Jun 2014 04:35:34 +0000 |
| Subject: | com php-src: C++ compiler doesn't allow cast a void * to other pointer type: Zend/zend_execute.h Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79098@lists.php.net to get a copy of this message | ||
Commit: f609d8c1c677d03d9ae380480ae72383c5a98106
Author: Xinchen Hui <laruence@php.net> Fri, 27 Jun 2014 12:35:34 +0800
Parents: 9af4b18b81502a2bea089a21ae7e43197322abe5
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f609d8c1c677d03d9ae380480ae72383c5a98106
Log:
C++ compiler doesn't allow cast a void * to other pointer type
Changed paths:
M Zend/zend_execute.h
M Zend/zend_string.h
Diff:
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 1b74564..b80d2ad 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -227,7 +227,7 @@ static zend_always_inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
int count = (size + (sizeof(zval) - 1)) / sizeof(zval);
ZEND_VM_STACK_GROW_IF_NEEDED(count);
- ret = (void*)EG(argument_stack)->top;
+ ret = EG(argument_stack)->top;
EG(argument_stack)->top += count;
return ret;
}
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index dfdc74e..5765188 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string..h
@@ -109,7 +109,7 @@ static zend_always_inline zend_uint zend_str_delref(zend_string *s)
static zend_always_inline zend_string *zend_str_alloc(int len, int persistent)
{
- zend_string *ret = pemalloc(_STR_HEADER_SIZE + len + 1, persistent);
+ zend_string *ret = (zend_string *)pemalloc(_STR_HEADER_SIZE + len + 1, persistent);
GC_REFCOUNT(ret) = 1;
#if 1
@@ -127,7 +127,7 @@ static zend_always_inline zend_string *zend_str_alloc(int len, int persistent)
static zend_always_inline zend_string *zend_str_safe_alloc(size_t n, size_t m, size_t l, int
persistent)
{
- zend_string *ret = safe_pemalloc(n, m, _STR_HEADER_SIZE + l + 1, persistent);
+ zend_string *ret = (zend_string *)safe_pemalloc(n, m, _STR_HEADER_SIZE + l + 1, persistent);
GC_REFCOUNT(ret) = 1;
#if 1
@@ -177,7 +177,7 @@ static zend_always_inline zend_string *zend_str_realloc(zend_string *s, int len,
ret = STR_ALLOC(len, persistent);
memcpy(ret->val, s->val, (len > s->len ? s->len : len) + 1);
} else if (STR_REFCOUNT(s) == 1) {
- ret = perealloc(s, _STR_HEADER_SIZE + len + 1, persistent);
+ ret = (zend_string *)perealloc(s, _STR_HEADER_SIZE + len + 1, persistent);
ret->len = len;
STR_FORGET_HASH_VAL(ret);
} else {
@@ -196,7 +196,7 @@ static zend_always_inline zend_string *zend_str_safe_realloc(zend_string *s, siz
ret = STR_SAFE_ALLOC(n, m, l, persistent);
memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
} else if (STR_REFCOUNT(s) == 1) {
- ret = safe_perealloc(s, n, m, _STR_HEADER_SIZE + l + 1, persistent);
+ ret = (zend_string *)safe_perealloc(s, n, m, _STR_HEADER_SIZE + l + 1, persistent);
ret->len = (n * m) + l;
STR_FORGET_HASH_VAL(ret);
} else {