diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-14 14:58:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 14:58:36 +0200 |
| commit | dcabc273376161cae10afd0eca399742b69e4f79 (patch) | |
| tree | e38643bf2d2d791aff64ce58fafd83f70493149d /platform | |
| parent | b193a172b0ddcb32f7fd81b20159148a7c08e411 (diff) | |
| parent | b627fcd2cd4f23dce32a1b279e82f263f4be0df1 (diff) | |
Merge pull request #50409 from godot-joe/fix-ambiguous-variant-on-debian-10-build
Fixes ambiguous variant error for build on Debian 10 (Buster) using clang v7
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/linuxbsd/os_linuxbsd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index c6a2fa5be7..8cd6ec43c6 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -425,7 +425,7 @@ Error OS_LinuxBSD::move_to_trash(const String &p_path) { // Generates the .trashinfo file OS::Date date = OS::get_singleton()->get_date(false); OS::Time time = OS::get_singleton()->get_time(false); - String timestamp = vformat("%04d-%02d-%02dT%02d:%02d:", date.year, date.month, date.day, time.hour, time.minute); + String timestamp = vformat("%04d-%02d-%02dT%02d:%02d:", date.year, (int)date.month, date.day, time.hour, time.minute); timestamp = vformat("%s%02d", timestamp, time.second); // vformat only supports up to 6 arguments. String trash_info = "[Trash Info]\nPath=" + p_path.uri_encode() + "\nDeletionDate=" + timestamp + "\n"; { |