summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorLars Næsbye Christensen <lars@naesbye.dk>2024-02-16 19:29:51 +0100
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-02-17 12:23:07 +0200
commit9e854b697a06abed2a0917fb6120445f176764f0 (patch)
tree7d430fa151e037525ae05d6030e309e9cdecde61 /indra/llcommon
parentd0e82ca55670645eacc61fca39bf8667c0840de9 (diff)
misc: BOOL to bool
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llstring.cpp2
-rw-r--r--indra/llcommon/llstring.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index ef77b0b1c8..6e6797312b 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -1359,7 +1359,7 @@ S32 LLStringUtil::format(std::string& s, const format_map_t& substitutions)
if (iter != substitutions.end())
{
S32 secFromEpoch = 0;
- BOOL r = LLStringUtil::convertToS32(iter->second, secFromEpoch);
+ bool r = LLStringUtil::convertToS32(iter->second, secFromEpoch);
if (r)
{
found_replacement = formatDatetime(replacement, tokens[0], param, secFromEpoch);
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 47dbf967cf..f2741a0e1f 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -382,7 +382,7 @@ public:
static void _makeASCII(string_type& string);
// Conversion to other data types
- static bool convertToBOOL(const string_type& string, BOOL& value);
+ static bool convertToBOOL(const string_type& string, bool& value);
static bool convertToU8(const string_type& string, U8& value);
static bool convertToS8(const string_type& string, S8& value);
static bool convertToS16(const string_type& string, S16& value);
@@ -1804,7 +1804,7 @@ auto LLStringUtilBase<T>::getenv(const std::string& key, const string_type& dflt
}
template<class T>
-bool LLStringUtilBase<T>::convertToBOOL(const string_type& string, BOOL& value)
+bool LLStringUtilBase<T>::convertToBOOL(const string_type& string, bool& value)
{
if( string.empty() )
{