aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@codesourcery.com>2000-10-26 05:50:19 +0000
committerGabriel Dos Reis <gdr@gcc.gnu.org>2000-10-26 05:50:19 +0000
commit5f9cd837907a3c3cc5158b688e68f37227974a8d (patch)
treea52dc669e9dbf901865d705405aa0244b6453576 /gcc
parent59c341cbd597446ab650612f6ad5f1c956b73bf2 (diff)
downloadgcc-5f9cd837907a3c3cc5158b688e68f37227974a8d.zip
gcc-5f9cd837907a3c3cc5158b688e68f37227974a8d.tar.gz
gcc-5f9cd837907a3c3cc5158b688e68f37227974a8d.tar.bz2
error.c (dump_function_decl): Print no space between `ptr-operator' the `type-specifier' of the return type.
cp/ * error.c (dump_function_decl): Print no space between `ptr-operator' the `type-specifier' of the return type. (dump_type_prefix): Make sure we put space at the appropriate place. testuite/g++.old-deja/g++.pt/ * g++.old-deja/g++.pt/memtemp77.C (main): Adjust comparaison operands. From-SVN: r37067
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/error.c13
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/memtemp77.C2
4 files changed, 20 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f7c2344..8e63dea 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-26 Gabriel Dos Reis <gdr@codesourcery.com>
+
+ * error.c (dump_function_decl): Print no space between
+ `ptr-operator' the `type-specifier' of the return type.
+ (dump_type_prefix): Make sure we put space at the appropriate
+ place.
+
2000-10-23 Jason Merrill <jason@redhat.com>
* call.c (equal_functions): Also call decls_match for extern "C" fns.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e5cbe37..91c9f6e 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -717,13 +717,14 @@ dump_type_prefix (t, flags)
so let the OFFSET_TYPE case handle it. */
if (!TYPE_PTRMEM_P (t))
{
- if (padding != none)
- output_add_space (scratch_buffer);
if (TREE_CODE (sub) == ARRAY_TYPE)
- print_left_paren (scratch_buffer);
+ {
+ output_add_space (scratch_buffer);
+ print_left_paren (scratch_buffer);
+ }
output_add_character
(scratch_buffer, "&*"[TREE_CODE (t) == POINTER_TYPE]);
- padding = dump_qualifiers (t, none);
+ padding = dump_qualifiers (t, before);
}
}
break;
@@ -1268,8 +1269,8 @@ dump_function_decl (t, flags)
&& !DECL_DESTRUCTOR_P (t);
if (show_return)
{
- if (dump_type_prefix (TREE_TYPE (fntype), flags) != none)
- output_add_space (scratch_buffer);
+ dump_type_prefix (TREE_TYPE (fntype), flags);
+ output_add_space (scratch_buffer);
}
/* Print the function name. */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3c75d3c..72755e7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-26 Gabriel Dos Reis <gdr@codesourcery.com>
+
+ * g++.old-deja/g++.pt/memtemp77.C (main): Adjust comparaison
+ operands.
+
2000-10-25 Joseph S. Myers <jsm28@cam.ac.uk>
* gcc.dg/qual-return-1.c, gcc.dg/qual-return-2.c: New tests.
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp77.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp77.C
index 756ed3e..0e5ebcd 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp77.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp77.C
@@ -18,7 +18,7 @@ const char* S3<char>::h(int) { return __PRETTY_FUNCTION__; }
int main()
{
if (strcmp (S3<double>::h(7),
- "const char *S3<T>::h(U) [with U = int, T = double]") == 0)
+ "const char* S3<T>::h(U) [with U = int, T = double]") == 0)
return 0;
else
return 1;