diff options
Diffstat (limited to 'zencore/compactbinary.cpp')
| -rw-r--r-- | zencore/compactbinary.cpp | 45 |
1 files changed, 20 insertions, 25 deletions
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp index 494b45581..cded378a1 100644 --- a/zencore/compactbinary.cpp +++ b/zencore/compactbinary.cpp @@ -197,8 +197,6 @@ DateTime::GetDate(int& Year, int& Month, int& Day) const std::string DateTime::ToString(const char* Format) const { - using namespace fmt::literals; - ExtendableStringBuilder<32> Result; int Year, Month, Day; @@ -215,32 +213,32 @@ DateTime::ToString(const char* Format) const // case 'a': Result.Append(IsMorning() ? TEXT("am") : TEXT("pm")); break; // case 'A': Result.Append(IsMorning() ? TEXT("AM") : TEXT("PM")); break; case 'd': - Result.Append("{:02}"_format(Day)); + Result.Append(fmt::format("{:02}", Day)); break; // case 'D': Result.Appendf(TEXT("%03i"), GetDayOfYear()); break; case 'm': - Result.Append("{:02}"_format(Month)); + Result.Append(fmt::format("{:02}", Month)); break; case 'y': - Result.Append("{:02}"_format(Year % 100)); + Result.Append(fmt::format("{:02}", Year % 100)); break; case 'Y': - Result.Append("{:04}"_format(Year)); + Result.Append(fmt::format("{:04}", Year)); break; case 'h': - Result.Append("{:02}"_format(GetHour12())); + Result.Append(fmt::format("{:02}", GetHour12())); break; case 'H': - Result.Append("{:02}"_format(GetHour())); + Result.Append(fmt::format("{:02}", GetHour())); break; case 'M': - Result.Append("{:02}"_format(GetMinute())); + Result.Append(fmt::format("{:02}", GetMinute())); break; case 'S': - Result.Append("{:02}"_format(GetSecond())); + Result.Append(fmt::format("{:02}", GetSecond())); break; case 's': - Result.Append("{:03}"_format(GetMillisecond())); + Result.Append(fmt::format("{:03}", GetMillisecond())); break; default: Result.Append(*Format); @@ -282,8 +280,6 @@ TimeSpan::Set(int Days, int Hours, int Minutes, int Seconds, int FractionNano) std::string TimeSpan::ToString(const char* Format) const { - using namespace fmt::literals; - StringBuilder<128> Result; Result.Append((int64_t(Ticks) < 0) ? '-' : '+'); @@ -295,31 +291,31 @@ TimeSpan::ToString(const char* Format) const switch (*Format) { case 'd': - Result.Append("{}"_format(GetDays())); + Result.Append(fmt::format("{}", GetDays())); break; case 'D': - Result.Append("{:08}"_format(GetDays())); + Result.Append(fmt::format("{:08}", GetDays())); break; case 'h': - Result.Append("{:02}"_format(GetHours())); + Result.Append(fmt::format("{:02}", GetHours())); break; case 'm': - Result.Append("{:02}"_format(GetMinutes())); + Result.Append(fmt::format("{:02}", GetMinutes())); break; case 's': - Result.Append("{:02}"_format(GetSeconds())); + Result.Append(fmt::format("{:02}", GetSeconds())); break; case 'f': - Result.Append("{:03}"_format(GetFractionMilli())); + Result.Append(fmt::format("{:03}", GetFractionMilli())); break; case 'u': - Result.Append("{:06}"_format(GetFractionMicro())); + Result.Append(fmt::format("{:06}", GetFractionMicro())); break; case 't': - Result.Append("{:07}"_format(GetFractionTicks())); + Result.Append(fmt::format("{:07}", GetFractionTicks())); break; case 'n': - Result.Append("{:09}"_format(GetFractionNano())); + Result.Append(fmt::format("{:09}", GetFractionNano())); break; default: Result.Append(*Format); @@ -1442,7 +1438,6 @@ public: void WriteField(CbFieldView Field) { - using namespace fmt::literals; using namespace std::literals; WriteOptionalComma(); @@ -1512,7 +1507,7 @@ public: const float Value = Accessor.AsFloat32(); if (std::isfinite(Value)) { - Builder.Append("{:.9g}"_format(Value)); + Builder.Append(fmt::format("{:.9g}", Value)); } else { @@ -1525,7 +1520,7 @@ public: const double Value = Accessor.AsFloat64(); if (std::isfinite(Value)) { - Builder.Append("{:.17g}"_format(Value)); + Builder.Append(fmt::format("{:.17g}", Value)); } else { |