diff options
| author | mingmingl <mingmingl@google.com> | 2025-02-04 11:11:14 -0800 |
|---|---|---|
| committer | mingmingl <mingmingl@google.com> | 2025-02-04 11:11:14 -0800 |
| commit | e91747a92d27ecf799427bf563f9f64f7c4d2447 (patch) | |
| tree | 7aa5a8a9170deec293e152bdf2be804399dcd612 /libcxx/src | |
| parent | 3a8d9337d816aef41c3ca1484be8b933a71a3c46 (diff) | |
| parent | 53d6e59b594639417cdbfcfa2d18cea64acb4009 (diff) | |
| download | llvm-users/mingmingl-llvm/spr/sdpglobalvariable.zip llvm-users/mingmingl-llvm/spr/sdpglobalvariable.tar.gz llvm-users/mingmingl-llvm/spr/sdpglobalvariable.tar.bz2 | |
Merge branch 'main' into users/mingmingl-llvm/spr/sdpglobalvariableusers/mingmingl-llvm/spr/sdpglobalvariable
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/experimental/time_zone.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/experimental/time_zone.cpp b/libcxx/src/experimental/time_zone.cpp index f7d82a5..289164a 100644 --- a/libcxx/src/experimental/time_zone.cpp +++ b/libcxx/src/experimental/time_zone.cpp @@ -668,7 +668,7 @@ __first_rule(seconds __stdoff, const vector<__tz::__rule>& __rules) { __continuation_end, __continuation.__stdoff + __save, chrono::duration_cast<minutes>(__save), - __continuation.__format}, + chrono::__format(__continuation, __continuation.__format, __save)}, true}; } |