From 6332fb48e49167e613b851cd7bf825b30ee159f5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 20 Aug 2014 11:51:26 -0400 Subject: Port to LLVM/Clang SVN r216002 (trunk) Rename 'c++1y' to 'c++14'. --- README.rst | 2 +- src/RunClang.cxx | 4 ++-- test/CMakeLists.txt | 2 +- test/expect/cmd.gccxml-and-c++14.result.txt | 1 + test/expect/cmd.gccxml-and-c++14.stderr.txt | 1 + test/expect/cmd.gccxml-and-c++1y.result.txt | 1 - test/expect/cmd.gccxml-and-c++1y.stderr.txt | 1 - 7 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 test/expect/cmd.gccxml-and-c++14.result.txt create mode 100644 test/expect/cmd.gccxml-and-c++14.stderr.txt delete mode 100644 test/expect/cmd.gccxml-and-c++1y.result.txt delete mode 100644 test/expect/cmd.gccxml-and-c++1y.stderr.txt diff --git a/README.rst b/README.rst index 95cddbc..e29f3a9 100644 --- a/README.rst +++ b/README.rst @@ -29,7 +29,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 - ``215464``. + ``216002``. * Optionally, the `Sphinx`_ documentation generator to build documentation. diff --git a/src/RunClang.cxx b/src/RunClang.cxx index 7c4e1f5..9043f5b 100644 --- a/src/RunClang.cxx +++ b/src/RunClang.cxx @@ -211,8 +211,8 @@ static bool runClangCI(clang::CompilerInstance* CI, Options const& opts) std::cerr << MSG("Objective C"); return false; } - if(CI->getLangOpts().CPlusPlus1y) { - std::cerr << MSG("c++1y"); + if(CI->getLangOpts().CPlusPlus14) { + std::cerr << MSG("c++14"); return false; } if(CI->getLangOpts().C11) { diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 618e617..4675d12 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -109,7 +109,7 @@ castxml_test_cmd(gccxml-twice --castxml-gccxml --castxml-gccxml) castxml_test_cmd(gccxml-and-c99 --castxml-gccxml -std=c99 ${empty_c}) castxml_test_cmd(gccxml-and-c11 --castxml-gccxml -std=c11 ${empty_c}) castxml_test_cmd(gccxml-and-c++11 --castxml-gccxml -std=c++11 ${empty_cxx}) -castxml_test_cmd(gccxml-and-c++1y --castxml-gccxml -std=c++1y ${empty_cxx}) +castxml_test_cmd(gccxml-and-c++14 --castxml-gccxml -std=c++14 ${empty_cxx}) castxml_test_cmd(gccxml-and-objc1 --castxml-gccxml ${empty_m}) castxml_test_cmd(gccxml-and-objc2 --castxml-gccxml ${empty_mm}) castxml_test_cmd(gccxml-empty-c++98 --castxml-gccxml -std=c++98 ${empty_cxx}) diff --git a/test/expect/cmd.gccxml-and-c++14.result.txt b/test/expect/cmd.gccxml-and-c++14.result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/test/expect/cmd.gccxml-and-c++14.result.txt @@ -0,0 +1 @@ +1 diff --git a/test/expect/cmd.gccxml-and-c++14.stderr.txt b/test/expect/cmd.gccxml-and-c++14.stderr.txt new file mode 100644 index 0000000..76ed9ea --- /dev/null +++ b/test/expect/cmd.gccxml-and-c++14.stderr.txt @@ -0,0 +1 @@ +^error: '--castxml-gccxml' does not work with c\+\+14$ diff --git a/test/expect/cmd.gccxml-and-c++1y.result.txt b/test/expect/cmd.gccxml-and-c++1y.result.txt deleted file mode 100644 index d00491f..0000000 --- a/test/expect/cmd.gccxml-and-c++1y.result.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/test/expect/cmd.gccxml-and-c++1y.stderr.txt b/test/expect/cmd.gccxml-and-c++1y.stderr.txt deleted file mode 100644 index 2505bc0..0000000 --- a/test/expect/cmd.gccxml-and-c++1y.stderr.txt +++ /dev/null @@ -1 +0,0 @@ -^error: '--castxml-gccxml' does not work with c\+\+1y$ -- cgit v0.12