Skip to content

ARROW-15520: [C++] Qualify arrow_vendored::date::format() for C++20 compatibility #12317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
StephanTLavavej wants to merge 3 commits into from
Closed

ARROW-15520: [C++] Qualify arrow_vendored::date::format() for C++20 compatibility #12317

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd035b1
C++20 compatibility: Qualify arrow_vendored::date::format().
StephanTLavavej Feb 1, 2022
bd49a68
Shorten lines with a namespace alias.
StephanTLavavej Feb 2, 2022
e147dab
Add comment
pitrou Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions cpp/src/arrow/array/diff.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,42 +639,44 @@ class MakeFormatterImpl {
auto fmt = fmt_str.c_str();
auto unit = checked_cast<const T&>(*array.type()).unit();
auto value = checked_cast<const NumericArray<T>&>(array).Value(index);
using arrow_vendored::date::format;
// Using unqualified `format` directly would produce ambiguous
// lookup because of `std::format` (ARROW-15520).
namespace avd = arrow_vendored::date;
using std::chrono::nanoseconds;
using std::chrono::microseconds;
using std::chrono::milliseconds;
using std::chrono::seconds;
if (AddEpoch) {
static arrow_vendored::date::sys_days epoch{arrow_vendored::date::jan / 1 / 1970};
static avd::sys_days epoch{avd::jan / 1 / 1970};

switch (unit) {
case TimeUnit::NANO:
*os << format(fmt, static_cast<nanoseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<nanoseconds>(value) + epoch);
break;
case TimeUnit::MICRO:
*os << format(fmt, static_cast<microseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<microseconds>(value) + epoch);
break;
case TimeUnit::MILLI:
*os << format(fmt, static_cast<milliseconds>(value) + epoch);
*os << avd::format(fmt, static_cast<milliseconds>(value) + epoch);
break;
case TimeUnit::SECOND:
*os << format(fmt, static_cast<seconds>(value) + epoch);
*os << avd::format(fmt, static_cast<seconds>(value) + epoch);
break;
}
return;
}
switch (unit) {
case TimeUnit::NANO:
*os << format(fmt, static_cast<nanoseconds>(value));
*os << avd::format(fmt, static_cast<nanoseconds>(value));
break;
case TimeUnit::MICRO:
*os << format(fmt, static_cast<microseconds>(value));
*os << avd::format(fmt, static_cast<microseconds>(value));
break;
case TimeUnit::MILLI:
*os << format(fmt, static_cast<milliseconds>(value));
*os << avd::format(fmt, static_cast<milliseconds>(value));
break;
case TimeUnit::SECOND:
*os << format(fmt, static_cast<seconds>(value));
*os << avd::format(fmt, static_cast<seconds>(value));
break;
}
};
Expand Down