PHPC-370: Additionally return_value_ptr and return_value_used suppressions

jmikola · derickr · commit 8aeb6437db3a · 2015-12-16T10:22:58.000Z
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -100,7 +100,7 @@ PHP_METHOD(ReadPreference, __construct)
 PHP_METHOD(ReadPreference, getMode)
 {
 	php_phongo_readpreference_t *intern;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 	intern = Z_READPREFERENCE_OBJ_P(getThis());
 
@@ -117,7 +117,7 @@ PHP_METHOD(ReadPreference, getMode)
 PHP_METHOD(ReadPreference, getTagSets)
 {
 	php_phongo_readpreference_t *intern;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 	intern = Z_READPREFERENCE_OBJ_P(getThis());
 
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -110,7 +110,7 @@ PHP_METHOD(WriteConcern, getW)
 {
 	php_phongo_writeconcern_t *intern;
 	const char *wtag;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 	intern = Z_WRITECONCERN_OBJ_P(getThis());
 
@@ -141,7 +141,7 @@ PHP_METHOD(WriteConcern, getW)
 PHP_METHOD(WriteConcern, getWtimeout)
 {
 	php_phongo_writeconcern_t *intern;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 	intern = Z_WRITECONCERN_OBJ_P(getThis());
 
@@ -158,7 +158,7 @@ PHP_METHOD(WriteConcern, getWtimeout)
 PHP_METHOD(WriteConcern, getJournal)
 {
 	php_phongo_writeconcern_t *intern;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 	intern = Z_WRITECONCERN_OBJ_P(getThis());
 

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ PHP_METHOD(ReadPreference, __construct)`
`100`	`100`	`PHP_METHOD(ReadPreference, getMode)`
`101`	`101`	`{`
`102`	`102`	`php_phongo_readpreference_t *intern;`
`103`		`- (void)return_value_ptr; (void)return_value_used;`
	`103`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)`
`104`	`104`
`105`	`105`	`intern = Z_READPREFERENCE_OBJ_P(getThis());`
`106`	`106`
`@@ -117,7 +117,7 @@ PHP_METHOD(ReadPreference, getMode)`
`117`	`117`	`PHP_METHOD(ReadPreference, getTagSets)`
`118`	`118`	`{`
`119`	`119`	`php_phongo_readpreference_t *intern;`
`120`		`- (void)return_value_ptr; (void)return_value_used;`
	`120`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)`
`121`	`121`
`122`	`122`	`intern = Z_READPREFERENCE_OBJ_P(getThis());`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ PHP_METHOD(WriteConcern, getW)`
`110`	`110`	`{`
`111`	`111`	`php_phongo_writeconcern_t *intern;`
`112`	`112`	`const char *wtag;`
`113`		`- (void)return_value_ptr; (void)return_value_used;`
	`113`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)`
`114`	`114`
`115`	`115`	`intern = Z_WRITECONCERN_OBJ_P(getThis());`
`116`	`116`
`@@ -141,7 +141,7 @@ PHP_METHOD(WriteConcern, getW)`
`141`	`141`	`PHP_METHOD(WriteConcern, getWtimeout)`
`142`	`142`	`{`
`143`	`143`	`php_phongo_writeconcern_t *intern;`
`144`		`- (void)return_value_ptr; (void)return_value_used;`
	`144`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)`
`145`	`145`
`146`	`146`	`intern = Z_WRITECONCERN_OBJ_P(getThis());`
`147`	`147`
`@@ -158,7 +158,7 @@ PHP_METHOD(WriteConcern, getWtimeout)`
`158`	`158`	`PHP_METHOD(WriteConcern, getJournal)`
`159`	`159`	`{`
`160`	`160`	`php_phongo_writeconcern_t *intern;`
`161`		`- (void)return_value_ptr; (void)return_value_used;`
	`161`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)`
`162`	`162`
`163`	`163`	`intern = Z_WRITECONCERN_OBJ_P(getThis());`
`164`	`164`