merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 188c0948c83c0605cde7833a9cdcf1ea989c8e30..3c6743b2caae45d1ce01c64e0bf29453573c916b 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-31  Douglas Gregor  <doug.gregor@gmail.com>
+
+       * demangle.h (enum demangle_component_type): Add
+       DEMANGLE_COMPONENT_RVALUE_REFERENCE.
+
 2007-07-25  Ben Elliston  <bje@au.ibm.com>
 
        * ternary.h: Remove.

diff --git a/include/demangle.h b/include/demangle.h
index 49f23e543ed841eeb1e4f114a2472c8f1893ff85..b55226d8590a6b1e67102d6562897645f6760f5a 100644 (file)
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -296,6 +296,9 @@ enum demangle_component_type
   /* A reference.  The one subtree is the type which is being
      referenced.  */
   DEMANGLE_COMPONENT_REFERENCE,
+  /* C++0x: An rvalue reference.  The one subtree is the type which is
+     being referenced.  */
+  DEMANGLE_COMPONENT_RVALUE_REFERENCE,
   /* A complex type.  The one subtree is the base type.  */
   DEMANGLE_COMPONENT_COMPLEX,
   /* An imaginary type.  The one subtree is the base type.  */