From f78a09434011532c8d63c6730195a193a84a2c6a Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Sun, 2 Jun 2024 14:45:37 +0200 Subject: [PATCH] refactor: Convert ArgsInfo::orig_included_pch_file to fs::path --- src/ccache/ArgsInfo.hpp | 2 +- src/ccache/argprocessing.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ccache/ArgsInfo.hpp b/src/ccache/ArgsInfo.hpp index e73586f0..c8969a8c 100644 --- a/src/ccache/ArgsInfo.hpp +++ b/src/ccache/ArgsInfo.hpp @@ -72,7 +72,7 @@ struct ArgsInfo std::filesystem::path output_al; // The given PCH filepath being compiled to (by -Fp option). - std::string orig_included_pch_file; + std::filesystem::path orig_included_pch_file; // The .gch/.pch/.pth file or directory used for compilation. std::string included_pch_file; diff --git a/src/ccache/argprocessing.cpp b/src/ccache/argprocessing.cpp index 030919ca..5792a13f 100644 --- a/src/ccache/argprocessing.cpp +++ b/src/ccache/argprocessing.cpp @@ -1366,7 +1366,7 @@ process_args(Context& ctx) bool included_pch_file_by_source = args_info.included_pch_file.empty(); if (!included_pch_file_by_source - && (*args_info.orig_included_pch_file.rbegin() == '\\' + && (util::pstr(args_info.orig_included_pch_file).str().back() == '\\' || DirEntry(args_info.orig_included_pch_file).is_directory())) { LOG("Unsupported folder path value for -Fp: {}", args_info.included_pch_file); -- 2.47.2