[llvm-branch-commits] [cfe-branch] r142722 - in /cfe/branches/release_30: ./ bindings/python/clang/cindex.py test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Sat Oct 22 06:35:15 2011
New Revision: 142722

URL: http://llvm.org/viewvc/llvm-project?rev=142722&view=rev
Log:
Merging r142474:
------------------------------------------------------------------------
r142474 | dgregor | 2011-10-18 22:47:46 -0700 (Tue, 18 Oct 2011) | 5 lines

This new field was introduced in clang-c in r141277

Python needs this in its structure definition so it allocates enough
memory. From Anders Waldenborg!

------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/bindings/python/clang/cindex.py
    cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 22 06:35:15 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349
+/cfe/trunk:142113,142133-142134,142187,142349,142474
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/bindings/python/clang/cindex.py
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/bindings/python/clang/cindex.py?rev=142722&r1=142721&r2=142722&view=diff
==============================================================================
--- cfe/branches/release_30/bindings/python/clang/cindex.py (original)
+++ cfe/branches/release_30/bindings/python/clang/cindex.py Sat Oct 22 06:35:15 2011
@@ -815,7 +815,7 @@
     The Cursor class represents a reference to an element within the AST. It
     acts as a kind of iterator.
     """
-    _fields_ = [("_kind_id", c_int), ("data", c_void_p * 3)]
+    _fields_ = [("_kind_id", c_int), ("xdata", c_int), ("data", c_void_p * 3)]
 
     def __eq__(self, other):
         return Cursor_eq(self, other)

Propchange: cfe/branches/release_30/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 22 06:35:15 2011
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133-142134,142187,142349
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,142113,142133-142134,142187,142349,142474