refactor: Convert ArgsInfo::orig_included_pch_file to fs::path

diff --git a/src/ccache/ArgsInfo.hpp b/src/ccache/ArgsInfo.hpp
index e73586f0c71d1a34ca79da85220a1ea34af1fa04..c8969a8c4146db05d62f7e6eb74a1b5cd80500c8 100644 (file)
--- 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 030919ca53d2ef9b7579824aa052ea712c3bff78..5792a13f2c56f94d133a0b4c81981bc6fdb2e786 100644 (file)
--- 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);