re PR objc++/27232 (encode-3.mm fails with "deprecated conversion" warning)

	PR objc++/27232

	Backport:
	2006-09-22  Mike Stump  <mrs@apple.com>

	* obj-c++.dg/encode-3.mm: Fix for 64-bit support.

From-SVN: r132212

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4070878ff0cc9d8e196a4adf4cb428926ae2f41f..6dc0c369d0b9ce43a9b82c8d1b7254da6950c460 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       PR objc++/27232
+
+       Backport:
+       2006-09-22  Mike Stump  <mrs@apple.com>
+       
+       * obj-c++.dg/encode-3.mm: Fix for 64-bit support.
+
 2008-02-04  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/33631

diff --git a/gcc/testsuite/obj-c++.dg/encode-3.mm b/gcc/testsuite/obj-c++.dg/encode-3.mm
index c67a972ddceea0c0f3a30731d5b2bdc760848a83..842a0bf37e588fb0d4a89b34579a09e79e24bc4d 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/encode-3.mm
+++ b/gcc/testsuite/obj-c++.dg/encode-3.mm
@@ -14,16 +14,22 @@ Vec<double> dd;
 const char *enc = @encode(Vec<float>);
 const char *enc2 = @encode(Vec<double>);
 
+#ifdef __LP64__
+#define L "q"
+#else
+#define L "l"
+#endif
+
 int main(void) {
-  char *encode = @encode(long);
+  const char *encode = @encode(long);
 
-  if (strcmp (encode, "l"))
+  if (strcmp (encode, L))
     abort();
 
-  if (strcmp (enc, "{Vec<float>=fflq}"))
+  if (strcmp (enc, "{Vec<float>=ff" L "q}"))
     abort();
 
-  if (strcmp (enc2, "{Vec<double>=ddlq}"))
+  if (strcmp (enc2, "{Vec<double>=dd" L "q}"))
     abort();
 
   return 0;