Port to LLVM/Clang SVN r232962 (trunk)

Clang renamed clang::DeclContext::{lookup_const_result => lookup_result}.
Use "auto" to automatically match either of these.

Update test expected output to match the lack of throws="" on
destructors in C++98 mode.

4 files changed, 9 insertions, 10 deletions

diff --git a/README.rst b/README.rst
index 47300af..7a004ae 100644
--- a/README.rst
+++ b/README.rst
@@ -38,7 +38,7 @@ To build CastXML from source, first obtain the prerequisites:
 
 * `LLVM/Clang`_ compiler SDK install tree built using the C++ compiler.
   This version of CastXML has been tested with LLVM/Clang SVN revision
-  ``223652``.
+  ``232962``.
 
 * Optionally, the `Sphinx`_ documentation generator to build documentation.
 
diff --git a/src/Output.cxx b/src/Output.cxx
index 2608704..8a387cb 100644
--- a/src/Output.cxx
+++ b/src/Output.cxx
@@ -1642,8 +1642,7 @@ void ASTVisitor::LookupStart(clang::DeclContext const* dc,
   std::string cur = name.substr(0, pos);
 
   clang::IdentifierTable& ids = CI.getPreprocessor().getIdentifierTable();
-  clang::DeclContext::lookup_const_result result =
-    dc->lookup(clang::DeclarationName(&ids.get(cur)));
+  auto const& result = dc->lookup(clang::DeclarationName(&ids.get(cur)));
   if(pos == name.npos) {
     for (clang::NamedDecl const* n: result) {
       this->AddStartDecl(n);
diff --git a/test/expect/gccxml.c++98.Class-bases.xml.txt b/test/expect/gccxml.c++98.Class-bases.xml.txt
index 3cadcb0..cee1dd7 100644
--- a/test/expect/gccxml.c++98.Class-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-bases.xml.txt
@@ -8,7 +8,7 @@
   <OperatorMethod id="_3" name="=" returns="_10" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws="">
     <Argument type="_11" location="f1:4" file="f1" line="4"/>
   </OperatorMethod>
-  <Destructor id="_4" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws=""/>
+  <Destructor id="_4" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_5" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws=""/>
   <Constructor id="_6" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws="">
     <Argument type="_11" location="f1:4" file="f1" line="4"/>
@@ -25,7 +25,7 @@
   <OperatorMethod id="_14" name="=" returns="_26" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
     <Argument type="_25" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
-  <Destructor id="_15" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws=""/>
+  <Destructor id="_15" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_16" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws=""/>
   <Constructor id="_17" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
     <Argument type="_27" location="f1:2" file="f1" line="2"/>
@@ -33,7 +33,7 @@
   <OperatorMethod id="_18" name="=" returns="_28" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
     <Argument type="_27" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
-  <Destructor id="_19" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws=""/>
+  <Destructor id="_19" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_20" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws=""/>
   <Constructor id="_21" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws="">
     <Argument type="_29" location="f1:3" file="f1" line="3"/>
@@ -41,7 +41,7 @@
   <OperatorMethod id="_22" name="=" returns="_30" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws="">
     <Argument type="_29" location="f1:3" file="f1" line="3"/>
   </OperatorMethod>
-  <Destructor id="_23" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws=""/>
+  <Destructor id="_23" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"( throws="")?/>
   <ReferenceType id="_25" type="_7c"/>
   <ReferenceType id="_26" type="_7"/>
   <ReferenceType id="_27" type="_8c"/>
diff --git a/test/expect/gccxml.c++98.Class-template-bases.xml.txt b/test/expect/gccxml.c++98.Class-template-bases.xml.txt
index 448de83..d866fa7 100644
--- a/test/expect/gccxml.c++98.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-template-bases.xml.txt
@@ -11,7 +11,7 @@
   <OperatorMethod id="_5" name="=" returns="_10" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws="">
     <Argument type="_9" location="f1:4" file="f1" line="4"/>
   </OperatorMethod>
-  <Destructor id="_6" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1" throws=""/>
+  <Destructor id="_6" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?/>
   <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14"/>
   <Class id="_8" name="dependent_base&lt;int&gt;" context="_2" location="f1:2" file="f1" line="2" members="_15 _16 _17 _18"/>
   <ReferenceType id="_9" type="_1c"/>
@@ -23,7 +23,7 @@
   <OperatorMethod id="_13" name="=" returns="_21" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
     <Argument type="_20" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
-  <Destructor id="_14" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws=""/>
+  <Destructor id="_14" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_15" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_16" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
     <Argument type="_22" location="f1:2" file="f1" line="2"/>
@@ -31,7 +31,7 @@
   <OperatorMethod id="_17" name="=" returns="_23" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
     <Argument type="_22" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
-  <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws=""/>
+  <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
   <ReferenceType id="_20" type="_7c"/>
   <ReferenceType id="_21" type="_7"/>
   <ReferenceType id="_22" type="_8c"/>