From 9c90831f17c8dfc8b3711093a4560d2f13c1ee5a Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 19 Mar 2020 14:57:15 -0400
Subject: [PATCH] Cleanup various string->c_str->string conversions
---
indra/llcommon/llerror.cpp | 2 +-
indra/llcommon/llstring.h | 2 +-
indra/llcommon/lluriparser.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index b46f49ba341..be21417025c 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -120,7 +120,7 @@ namespace {
public:
RecordToFile(const std::string& filename)
{
- mFile.open(filename.c_str(), std::ios_base::out | std::ios_base::app);
+ mFile.open(filename, std::ios_base::out | std::ios_base::app);
if (!mFile)
{
LL_INFOS() << "Error setting log file to " << filename << LL_ENDL;
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index dd0ed69237e..b912bf69403 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -1357,7 +1357,7 @@ BOOL LLStringUtilBase<T>::precedesDict( const string_type& a, const string_type&
{
if( a.size() && b.size() )
{
- return (LLStringUtilBase<T>::compareDict(a.c_str(), b.c_str()) < 0);
+ return (LLStringUtilBase<T>::compareDict(a, b) < 0);
}
else
{
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index c275b90120d..fde6ed65e50 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -39,7 +39,7 @@ LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mNormalizedT
mTmpScheme = true;
}
- mNormalizedUri += u.c_str();
+ mNormalizedUri.append(u);
mRes = parse();
}
--
GitLab