In gcc/testsuite/: 2011-03-04 Nicola Pero <nicola.pero@meta-innovation.com>

In gcc/testsuite/:
2011-03-04  Nicola Pero  <nicola.pero@meta-innovation.com>

	* objc.dg/property/property-encoding-1.m: Tidied up testcase.
	* obj-c++.dg/property/property-encoding-1.mm: Likewise.

From-SVN: r170684

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9e88c468a82beeabf85edd6f80292020ab9e4cc4..06b9e1d61a856998f5ace77d771d76f632a7a6a1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-04  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+       * objc.dg/property/property-encoding-1.m: Tidied up testcase.
+       * obj-c++.dg/property/property-encoding-1.mm: Likewise.
+
 2011-03-04  Nicola Pero  <nicola.pero@meta-innovation.com>
 
        * objc.dg/gnu-api-2-property.m: Added tests for property_getName()

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 03f273c13b66fed2ce7cbbde6498577018d0a296..dc12c3137b93f2de2ec816b1b22ebbf55fd43e0b 100644 (file)
--- 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 64b35e7690e7506673f41de7e8e2d8a11fdcc9c5..dc12c3137b93f2de2ec816b1b22ebbf55fd43e0b 100644 (file)
--- 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