Fix updates to clang 13 API

scrt · Mar 9, 2022 · b30f78b · b30f78b
1 parent f34e447
commit b30f78b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/MatchHandler.cpp b/MatchHandler.cpp
@@ -185,7 +185,7 @@ void MatchHandler::handleCallExpr(const clang::StringLiteral *pLiteral, clang::A
         StringType = "TCHAR ";
     }
 
-    for(auto i = 0 ; i < FunctionCall->getDirectCallee()->getNumParams() ; i++) {
+    for(unsigned int i = 0 ; i < FunctionCall->getDirectCallee()->getNumParams() ; i++) {
 
         auto ArgStart = pContext->getSourceManager().getSpellingColumnNumber(FunctionCall->getArg(i)->getBeginLoc());
         auto StringStart = pContext->getSourceManager().getSpellingColumnNumber(pLiteral->getBeginLoc());
@@ -234,7 +234,7 @@ void MatchHandler::handleVarDeclExpr(const clang::StringLiteral *pLiteral, clang
     if(Type.find(" []") != std::string::npos)
         LHSReplacement = Type.replace(Type.find(" []"),3,"* ");
 
-    LHSReplacement.append(Identifier.data());
+    LHSReplacement.append(Identifier);
 
     llvm::outs() << "Type of " << Identifier << " is " << Type << "\n";
     std::string NewType = Type+" ";

diff --git a/main.cpp b/main.cpp
@@ -25,8 +25,9 @@
 #include <vector>
 #include <fstream>
 
+
 namespace ClSetup {
-    llvm::cl::OptionCategory ToolCategory("AVObfuscator");
+    static llvm::cl::OptionCategory ToolCategory("AVObfuscator");
 
     llvm::cl::opt<bool> IsEditEnabled("edit",
                                       llvm::cl::desc("Edit the file in place, or write a copy with .patch extension."),
@@ -210,9 +211,9 @@ auto main(int argc, const char *argv[]) -> int {
     using namespace clang::tooling;
     using namespace ClSetup;
 
-    CommonOptionsParser OptionsParser(argc, argv, ToolCategory);
-    ClangTool Tool(OptionsParser.getCompilations(),
-                   OptionsParser.getSourcePathList());
+    auto option_parser = CommonOptionsParser::create(argc, argv, ToolCategory);
+    ClangTool Tool(option_parser->getCompilations(),
+                   option_parser->getSourcePathList());
 
     auto Action = newFrontendActionFactory<AVObfuscator::Action>();
     return Tool.run(Action.get());