From 78a8b16bad41d3d358ea1fe9e5c44d9270a377bf Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Fri, 4 Mar 2011 19:09:34 +0000 Subject: [PATCH] In gcc/testsuite/: 2011-03-04 Nicola Pero In gcc/testsuite/: 2011-03-04 Nicola Pero * objc.dg/property/property-encoding-1.m: Tidied up testcase. * obj-c++.dg/property/property-encoding-1.mm: Likewise. From-SVN: r170684 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/obj-c++.dg/property/property-encoding-1.mm | 7 +++---- gcc/testsuite/objc.dg/property/property-encoding-1.m | 7 +++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9e88c468a82..06b9e1d61a8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2011-03-04 Nicola Pero + * objc.dg/property/property-encoding-1.m: Tidied up testcase. + * obj-c++.dg/property/property-encoding-1.mm: Likewise. + +2011-03-04 Nicola Pero + * objc.dg/gnu-api-2-property.m: Added tests for property_getName() and property_getAttributes() if __OBJC2__. * obj-c++.dg/gnu-api-2-property.mm: Likewise. diff --git a/gcc/testsuite/obj-c++.dg/property/property-encoding-1.mm b/gcc/testsuite/obj-c++.dg/property/property-encoding-1.mm index 03f273c13b6..dc12c3137b9 100644 --- a/gcc/testsuite/obj-c++.dg/property/property-encoding-1.mm +++ b/gcc/testsuite/obj-c++.dg/property/property-encoding-1.mm @@ -89,22 +89,21 @@ void error (objc_property_t p) } /* Concatenate 3 strings and return the result. */ -char *concat (char *a, char *b, char *c) +char *concat (const char *a, const char *b, const char *c) { /* We happily leak memory here. This is a test. */ - char *x = malloc (sizeof (char) * 128); + char *x = (char *)malloc (sizeof (char) * 128); snprintf (x, 128, "%s%s%s", a, b, c); return x; } #endif -int main(int argc, char **args) +int main (void) { #ifdef __OBJC2__ Class c = objc_getClass ("MySubClass"); objc_property_t p; - const char *expected_result; p = class_getProperty (c, "char_property"); /* Usually we expect "Tc,Vchar_property", but if a char is of diff --git a/gcc/testsuite/objc.dg/property/property-encoding-1.m b/gcc/testsuite/objc.dg/property/property-encoding-1.m index 64b35e7690e..dc12c3137b9 100644 --- a/gcc/testsuite/objc.dg/property/property-encoding-1.m +++ b/gcc/testsuite/objc.dg/property/property-encoding-1.m @@ -89,22 +89,21 @@ void error (objc_property_t p) } /* Concatenate 3 strings and return the result. */ -char *concat (char *a, char *b, char *c) +char *concat (const char *a, const char *b, const char *c) { /* We happily leak memory here. This is a test. */ - char *x = malloc (sizeof (char) * 128); + char *x = (char *)malloc (sizeof (char) * 128); snprintf (x, 128, "%s%s%s", a, b, c); return x; } #endif -int main(int argc, void **args) +int main (void) { #ifdef __OBJC2__ Class c = objc_getClass ("MySubClass"); objc_property_t p; - const char *expected_result; p = class_getProperty (c, "char_property"); /* Usually we expect "Tc,Vchar_property", but if a char is of -- 2.11.4.GIT