clang/Makefile | 4 ++-- clang/README | 3 +-- clang/bin/clang-rename-wrapper | 4 +++- clang/find-unprefixed-members.cxx | 6 +----- 4 files changed, 7 insertions(+), 10 deletions(-)
New commits: commit e4aa3f47e6910dd4b202d802e755d217cad757cf Author: Miklos Vajna <[email protected]> AuthorDate: Mon Feb 21 12:08:10 2022 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Feb 21 12:09:46 2022 +0100 clang: fix find-unprefixed-members to build against clang 12 And drop the old compat code that was only needed for <= 3.5. diff --git a/clang/Makefile b/clang/Makefile index ae5a54d..71ab3c5 100644 --- a/clang/Makefile +++ b/clang/Makefile @@ -2,8 +2,8 @@ CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti CLANGWARNS=-Werror -Wall -Wno-missing-braces -Wnon-virtual-dtor -Wendif-labels -Wextra -Wundef -Wunused-macros -Wshadow -Woverloaded-virtual -CLANGFLAGS = $(CLANGDEFS) $(CLANGWARNS) -g -std=c++11 -CLANGLIBS = -lclangAST -lclangBasic -lclangFrontend -lclangRewrite -lclangTooling -lclangLex -lLLVM +CLANGFLAGS = $(CLANGDEFS) $(CLANGWARNS) -g +CLANGLIBS = -lclang-cpp -lLLVM ifneq ($(GCOV),) CLANGFLAGS += --coverage endif diff --git a/clang/README b/clang/README index 1906d81..12a932d 100644 --- a/clang/README +++ b/clang/README @@ -19,8 +19,7 @@ Details: - member functions - classes - tested with clang - - 3.5 - - 3.7 + - 12 == Hello world diff --git a/clang/bin/clang-rename-wrapper b/clang/bin/clang-rename-wrapper index da7cbac..d25ece9 100755 --- a/clang/bin/clang-rename-wrapper +++ b/clang/bin/clang-rename-wrapper @@ -29,7 +29,9 @@ if [ -n "$file" ]; then mkdir -p /tmp/rename RENAME_ARGS="$RENAME_ARGS -export-fixes=$(mktemp -p /tmp/rename XXXXXXXXXX.yaml)" fi - $myname $RENAME_ARGS $file -- "$@" + # Avoid "error: unable to find plugin 'loplugin'". + args="$(echo "$@"|sed "s|-Xclang -load -Xclang $SRC_ROOT/compilerplugins/clang/plugin.so -Xclang -add-plugin -Xclang loplugin||")" + $myname $RENAME_ARGS $file -- $args ret=$? fi diff --git a/clang/find-unprefixed-members.cxx b/clang/find-unprefixed-members.cxx index d3d65b3..73a582b 100644 --- a/clang/find-unprefixed-members.cxx +++ b/clang/find-unprefixed-members.cxx @@ -305,14 +305,10 @@ public: { } -#if (__clang_major__ == 3 && __clang_minor__ >= 6) || __clang_major__ > 3 std::unique_ptr<clang::ASTConsumer> newASTConsumer() { - return llvm::make_unique<ASTConsumer>(m_rContext); + return std::make_unique<ASTConsumer>(m_rContext); } -#else - clang::ASTConsumer* newASTConsumer() { return new ASTConsumer(m_rContext); } -#endif }; int main(int argc, const char** argv)
