From: Nicola Pero <nicola.pero@meta-innovation.com>
Date: Fri, 4 Mar 2011 19:09:34 +0000 (+0000)
Subject: In gcc/testsuite/: 2011-03-04 Nicola Pero <nicola.pero@meta-innovation.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=78a8b16bad41d3d358ea1fe9e5c44d9270a377bf;p=gcc.git

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 9e88c468a82..06b9e1d61a8 100644
--- 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 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