From 9fb015f72c3871b905e53df6a66bd32eb57ff276 Mon Sep 17 00:00:00 2001 From: Owen Clarke Date: Sun, 26 Feb 2012 18:49:13 -0500 Subject: [PATCH] Portability - Added new 'format' overload to resolve compiler warnings on Solaris. Signed-off-by: Paul Beckingham --- src/text.cpp | 12 ++++++++++++ src/text.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/text.cpp b/src/text.cpp index c78addd37..e33876d16 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -953,6 +953,18 @@ const std::string format ( return output; } +//////////////////////////////////////////////////////////////////////////////// +const std::string format ( + const std::string& fmt, + const std::string& arg1, + double arg2) +{ + std::string output = fmt; + replace_positional (output, "{1}", arg1); + replace_positional (output, "{2}", trim (format (arg2, 6, 3))); + return output; +} + //////////////////////////////////////////////////////////////////////////////// const std::string format ( const std::string& fmt, diff --git a/src/text.h b/src/text.h index 067a458cb..cb81ea9a1 100644 --- a/src/text.h +++ b/src/text.h @@ -80,6 +80,7 @@ const std::string format (const std::string&, const std::string&); const std::string format (const std::string&, int); const std::string format (const std::string&, const std::string&, const std::string&); const std::string format (const std::string&, const std::string&, int); +const std::string format (const std::string&, const std::string&, double); const std::string format (const std::string&, int, const std::string&); const std::string format (const std::string&, int, int); const std::string format (const std::string&, int, double);