summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/c-family/ChangeLog5
-rw-r--r--gcc/c-family/c-ada-spec.c2
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/other/dump-ada-spec-3.C3
4 files changed, 10 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 07fe10bf139..fa08958ac6c 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-06 Eric Botcazou <ebotcazou@adacore.com>
+ Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ * c-ada-spec.c (dump_ada_double_name): Fix pasto.
+
2015-03-05 Eric Botcazou <ebotcazou@adacore.com>
PR ada/65319
diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index 2dce3cf0cb8..fcd27037d52 100644
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -1390,7 +1390,7 @@ dump_ada_double_name (pretty_printer *buffer, tree t1, tree t2, const char *s)
pp_underscore (buffer);
- if (DECL_NAME (t1))
+ if (DECL_NAME (t2))
pp_ada_tree_identifier (buffer, DECL_NAME (t2), t2, false);
else
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 321db122f76..f9f79c31596 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-06 Eric Botcazou <ebotcazou@adacore.com>
+
+ * g++.dg/other/dump-ada-spec-3.C: Remove include and adjust.
+
2015-03-05 Bernd Edlinger <bernd.edlinger@hotmail.de>
* gcc.target/arm/pr65067.c: New test.
diff --git a/gcc/testsuite/g++.dg/other/dump-ada-spec-3.C b/gcc/testsuite/g++.dg/other/dump-ada-spec-3.C
index 3d5e3f10dfc..ae4985cb594 100644
--- a/gcc/testsuite/g++.dg/other/dump-ada-spec-3.C
+++ b/gcc/testsuite/g++.dg/other/dump-ada-spec-3.C
@@ -1,8 +1,6 @@
/* { dg-do compile } */
/* { dg-options "-fdump-ada-spec" } */
-#include <iostream>
-
using namespace std;
class Base {
@@ -14,7 +12,6 @@ class Base {
};
void Base::Primitive () {
- cout << "C++ Primitive " << this->My_V << "\n";
}
Base::Base () {