summaryrefslogtreecommitdiffstats
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/mangle.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 76dddf5b44b..cc5e063d0e8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-31 Douglas Gregor <doug.gregor@gmail.com>
+
+ * mangle.c (write_type): Change mangling of rvalue reference from
+ `RR' to `O'.
+
2007-08-31 Jakub Jelinek <jakub@redhat.com>
* decl.c (duplicate_decls): Remove duplicated line.
@@ -33,6 +38,7 @@
(get_delta_difference_1): New function.
(get_delta_difference): Refactor to call get_delta_difference_1.
+>>>>>>> .r127998
2007-08-28 Paolo Carlini <pcarlini@suse.de>
PR c++/33209
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 17594761d00..cad76e37631 100644
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -1646,8 +1646,9 @@ write_type (tree type)
case REFERENCE_TYPE:
if (TYPE_REF_IS_RVALUE (type))
- write_char('R');
- write_char ('R');
+ write_char('O');
+ else
+ write_char ('R');
write_type (TREE_TYPE (type));
break;
OpenPOWER on IntegriCloud