Fix include next warning

Author: lucic71

cpp2rust/compat/platform_flags.h

@@ -6,15 +6,20 @@
 #include <string>
 #include <vector>
 
-static inline std::vector<std::string> getPlatformClangFlags() {
+static inline std::vector<std::string> getPlatformClangBeginFlags() {
   std::vector<std::string> flags = {
       "-resource-dir=" CLANG_RESOURCE_DIR,
       "-I" COMPAT_INCLUDE_DIR,
       "-D_FORTIFY_SOURCE=0",
-      "-Wno-gnu-include-next",
   };
 #ifdef MACOS_SDK_PATH
   flags.push_back("-isysroot" MACOS_SDK_PATH);
 #endif
   return flags;
 }
+
+static inline std::vector<std::string> getPlatformClangEndFlags() {
+  return {
+      "-Wno-gnu-include-next",
+  };
+}

cpp2rust/converter/translation_rule.cpp

@@ -853,8 +853,10 @@ TypeTgt ParseTypeTgtJSON(const llvm::json::Object &obj) {
 }
 
 RuleMap LoadSrc(const std::filesystem::path &src_path) {
-  clang::tooling::FixedCompilationDatabase compilations(
-      ".", getPlatformClangFlags());
+  auto flags = getPlatformClangBeginFlags();
+  auto end_flags = getPlatformClangEndFlags();
+  flags.insert(flags.end(), end_flags.begin(), end_flags.end());
+  clang::tooling::FixedCompilationDatabase compilations(".", flags);
   RuleMap out;
   ActionFactory factory(out);
   clang::tooling::ClangTool tool(compilations, {src_path.string()});

cpp2rust/cpp2rust_lib.cpp

@@ -15,9 +15,11 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
                          const std::vector<std::string_view> &cxx_flags,
                          const std::string &rules_dir,
                          std::string_view filename) {
-  auto tool_args = getPlatformClangFlags();
+  auto tool_args = getPlatformClangBeginFlags();
   tool_args.push_back("-fparse-all-comments");
   tool_args.insert(tool_args.end(), cxx_flags.begin(), cxx_flags.end());
+  auto end_flags = getPlatformClangEndFlags();
+  tool_args.insert(tool_args.end(), end_flags.begin(), end_flags.end());
 
   std::string rs_code;
   clang::tooling::runToolOnCodeWithArgs(
@@ -43,7 +45,10 @@ std::string TranspileDir(std::string_view build_dir, Model model,
 
   clang::tooling::ClangTool Tool(*compile_dbase, files);
   Tool.appendArgumentsAdjuster(clang::tooling::getInsertArgumentAdjuster(
-      getPlatformClangFlags(), clang::tooling::ArgumentInsertPosition::BEGIN));
+      getPlatformClangBeginFlags(),
+      clang::tooling::ArgumentInsertPosition::BEGIN));
+  Tool.appendArgumentsAdjuster(clang::tooling::getInsertArgumentAdjuster(
+      getPlatformClangEndFlags(), clang::tooling::ArgumentInsertPosition::END));
 
   std::string rs_code;
   FrontendActionFactory factory(rs_code, model, rules_dir);