From 08cd34699e616065220267bf411cb89c38ef5a3c Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 17 Dec 2020 15:08:08 -0500
Subject: [PATCH] Revert "Convert llsd to use absl format instead of C printf"
This reverts commit c5d84f0392848948b79752f803b01f57880b8de3.
---
indra/llcommon/llsd.cpp | 4 ++--
indra/llcommon/llsdserialize.cpp | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index 6c844a9f40b..01ea04b0998 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -239,7 +239,7 @@ namespace
};
LLSD::String ImplInteger::asString() const
- { return absl::StrFormat("%d", mValue); }
+ { return llformat("%d", mValue); }
class ImplReal
@@ -261,7 +261,7 @@ namespace
{ return !llisnan(mValue) ? (LLSD::Integer)mValue : 0; }
LLSD::String ImplReal::asString() const
- { return absl::StrFormat("%lg", mValue); }
+ { return llformat("%lg", mValue); }
class ImplString
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index ba76ad559b7..22b24a06b4f 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -1246,7 +1246,8 @@ S32 LLSDFormatter::format(const LLSD& data, std::ostream& ostr, EFormatterOption
void LLSDFormatter::formatReal(LLSD::Real real, std::ostream& ostr) const
{
- ostr << absl::StreamFormat(mRealFormat.c_str(), real);
+ std::string buffer = llformat(mRealFormat.c_str(), real);
+ ostr << buffer;
}
/**
--
GitLab