diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index b46f49ba341b9c73ffe72cc510518f99521096e4..be21417025c70870925a0b8f271e6f2501d0b065 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 dd0ed69237ebaf27086bc1cc006f1e7e69abb69d..b912bf694038879560ca2a0ce942a8626a9adbf9 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 c275b90120d976123822300688aa568dbeda0efa..fde6ed65e50368425662b3e46ca16e2490de3682 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(); }