diff options
| author | 2023-11-03 23:08:54 +0000 | |
|---|---|---|
| committer | 2023-12-14 18:47:34 +0000 | |
| commit | 460de8d128e14841e47cc6ce30b6aa30768126a6 (patch) | |
| tree | 81535fff82316df70927ee2e9557b6ae227da612 | |
| parent | a41642764ccd9381f4c71cb0a203a7f2627635de (diff) | |
Update fmtlib to 10.1.1
Test: m
Change-Id: I53d6b73417229b191c08974e2ea3edb19e9b3a6b
| -rw-r--r-- | artd/path_utils.cc | 6 | ||||
| -rw-r--r-- | libarttools/art_exec.cc | 1 | ||||
| -rw-r--r-- | odrefresh/odrefresh.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/artd/path_utils.cc b/artd/path_utils.cc index 0972775f08..d3060cceb1 100644 --- a/artd/path_utils.cc +++ b/artd/path_utils.cc @@ -237,7 +237,8 @@ Result<std::string> BuildFinalProfilePath(const TmpProfilePath& tmp_profile_path // No default. All cases should be explicitly handled, or the compilation will fail. } // This should never happen. Just in case we get a non-enumerator value. - LOG(FATAL) << ART_FORMAT("Unexpected writable profile path type {}", final_path.getTag()); + LOG(FATAL) << ART_FORMAT("Unexpected writable profile path type {}", + fmt::underlying(final_path.getTag())); } Result<std::string> BuildTmpProfilePath(const TmpProfilePath& tmp_profile_path) { @@ -270,7 +271,8 @@ Result<std::string> BuildProfileOrDmPath(const ProfilePath& profile_path) { // No default. All cases should be explicitly handled, or the compilation will fail. } // This should never happen. Just in case we get a non-enumerator value. - LOG(FATAL) << ART_FORMAT("Unexpected profile path type {}", profile_path.getTag()); + LOG(FATAL) << ART_FORMAT("Unexpected profile path type {}", + fmt::underlying(profile_path.getTag())); } Result<std::string> BuildVdexPath(const VdexPath& vdex_path) { diff --git a/libarttools/art_exec.cc b/libarttools/art_exec.cc index 8f3365885b..37a2a5fb70 100644 --- a/libarttools/art_exec.cc +++ b/libarttools/art_exec.cc @@ -30,6 +30,7 @@ #include <unordered_set> #include <vector> +#include "android-base/format.h" #include "android-base/logging.h" #include "android-base/parseint.h" #include "android-base/result.h" diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc index 12ce681ddd..ea1bfad5b5 100644 --- a/odrefresh/odrefresh.cc +++ b/odrefresh/odrefresh.cc @@ -488,7 +488,7 @@ Result<void> AddCacheInfoFd(/*inout*/ CmdlineBuilder& args, const std::string& cache_info_filename) { std::unique_ptr<File> cache_info_file(OS::OpenFileForReading(cache_info_filename.c_str())); if (cache_info_file == nullptr) { - return ErrnoErrorf("Failed to open a cache info file '{}'", cache_info_file); + return ErrnoErrorf("Failed to open a cache info file '{}'", cache_info_filename); } args.Add("--cache-info-fd=%d", cache_info_file->Fd()); |