com php-src: C++ doesn't allow implicitly convert void * to other pointer type: Zend/zend_string.h
| From: | Xinchen Hui | Date: | Sat, 28 Jun 2014 03:19:38 +0000 |
| Subject: | com php-src: C++ doesn't allow implicitly convert void * to other pointer type: Zend/zend_string.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79100@lists.php.net to get a copy of this message | ||
Commit: 7614fe810eba7ce16f100c2c9e592922fd9e739c
Author: Xinchen Hui <laruence@php.net> Sat, 28 Jun 2014 11:19:38 +0800
Parents: 2f574e282e40874dfb8a03826a8c3c8576911bb2
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7614fe810eba7ce16f100c2c9e592922fd9e739c
Log:
C++ doesn't allow implicitly convert void * to other pointer type
Changed paths:
M Zend/zend_string.h
Diff:
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 5765188..6a24c5d 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string..h
@@ -57,7 +57,7 @@ END_EXTERN_C()
#define _STR_HEADER_SIZE XtOffsetOf(zend_string, val)
#define STR_ALLOCA_ALLOC(str, _len, use_heap) do { \
- (str) = do_alloca(_STR_HEADER_SIZE + (_len) + 1, (use_heap)); \
+ (str) = (zend_string *)do_alloca(_STR_HEADER_SIZE + (_len) + 1, (use_heap)); \
GC_REFCOUNT(str) = 1; \
(str)->h = 0; \
(str)->len = (_len); \