From 9e854b697a06abed2a0917fb6120445f176764f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20N=C3=A6sbye=20Christensen?= <lars@naesbye.dk>
Date: Fri, 16 Feb 2024 19:29:51 +0100
Subject: misc: BOOL to bool
---
indra/llmessage/llassetstorage.cpp | 2 +-
indra/llmessage/llmessagereader.h | 2 +-
indra/llmessage/llsdmessagereader.cpp | 2 +-
indra/llmessage/llsdmessagereader.h | 2 +-
indra/llmessage/lltemplatemessagereader.cpp | 2 +-
indra/llmessage/lltemplatemessagereader.h | 2 +-
indra/llmessage/llxfermanager.cpp | 4 ++--
indra/llmessage/message.cpp | 4 ++--
indra/llmessage/message.h | 4 ++--
9 files changed, 12 insertions(+), 12 deletions(-)
(limited to 'indra/llmessage')
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index f38a5e663e..60d95c3367 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -1020,7 +1020,7 @@ void LLAssetStorage::processUploadComplete(LLMessageSystem *msg, void **user_dat
LLUUID uuid;
S8 asset_type_s8;
LLAssetType::EType asset_type;
- BOOL success = FALSE;
+ bool success = false;
msg->getUUIDFast(_PREHASH_AssetBlock, _PREHASH_UUID, uuid);
msg->getS8Fast(_PREHASH_AssetBlock, _PREHASH_Type, asset_type_s8);
diff --git a/indra/llmessage/llmessagereader.h b/indra/llmessage/llmessagereader.h
index 3b77a6bfe4..647f267785 100644
--- a/indra/llmessage/llmessagereader.h
+++ b/indra/llmessage/llmessagereader.h
@@ -52,7 +52,7 @@ class LLMessageReader
/** All get* methods expect pointers to canonical strings. */
virtual void getBinaryData(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX) = 0;
- virtual void getBOOL(const char *block, const char *var, BOOL &data, S32 blocknum = 0) = 0;
+ virtual void getBOOL(const char *block, const char *var, bool &data, S32 blocknum = 0) = 0;
virtual void getS8(const char *block, const char *var, S8 &data, S32 blocknum = 0) = 0;
virtual void getU8(const char *block, const char *var, U8 &data, S32 blocknum = 0) = 0;
virtual void getS16(const char *block, const char *var, S16 &data, S32 blocknum = 0) = 0;
diff --git a/indra/llmessage/llsdmessagereader.cpp b/indra/llmessage/llsdmessagereader.cpp
index b729ebafa9..d533d6535b 100644
--- a/indra/llmessage/llsdmessagereader.cpp
+++ b/indra/llmessage/llsdmessagereader.cpp
@@ -114,7 +114,7 @@ void LLSDMessageReader::getBinaryData(const char *block, const char *var,
//virtual
void LLSDMessageReader::getBOOL(const char *block, const char *var,
- BOOL &data,
+ bool &data,
S32 blocknum)
{
data = getLLSD(mMessage, block, var, blocknum);
diff --git a/indra/llmessage/llsdmessagereader.h b/indra/llmessage/llsdmessagereader.h
index 3b3d7fbfbe..4119de6009 100644
--- a/indra/llmessage/llsdmessagereader.h
+++ b/indra/llmessage/llsdmessagereader.h
@@ -46,7 +46,7 @@ public:
virtual void getBinaryData(const char *block, const char *var,
void *datap, S32 size, S32 blocknum = 0,
S32 max_size = S32_MAX);
- virtual void getBOOL(const char *block, const char *var, BOOL &data,
+ virtual void getBOOL(const char *block, const char *var, bool &data,
S32 blocknum = 0);
virtual void getS8(const char *block, const char *var, S8 &data,
S32 blocknum = 0);
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index 32f79f0546..8a41d5565d 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -284,7 +284,7 @@ void LLTemplateMessageReader::getU8(const char *block, const char *var,
}
void LLTemplateMessageReader::getBOOL(const char *block, const char *var,
- BOOL &b, S32 blocknum )
+ bool &b, S32 blocknum )
{
U8 value;
getData(block, var, &value, sizeof(U8), blocknum);
diff --git a/indra/llmessage/lltemplatemessagereader.h b/indra/llmessage/lltemplatemessagereader.h
index fcf8f92fa6..88889cd7d2 100644
--- a/indra/llmessage/lltemplatemessagereader.h
+++ b/indra/llmessage/lltemplatemessagereader.h
@@ -47,7 +47,7 @@ public:
virtual void getBinaryData(const char *blockname, const char *varname,
void *datap, S32 size, S32 blocknum = 0,
S32 max_size = S32_MAX);
- virtual void getBOOL(const char *block, const char *var, BOOL &data,
+ virtual void getBOOL(const char *block, const char *var, bool &data,
S32 blocknum = 0);
virtual void getS8(const char *block, const char *var, S8 &data,
S32 blocknum = 0);
diff --git a/indra/llmessage/llxfermanager.cpp b/indra/llmessage/llxfermanager.cpp
index f9b59d7e42..956ecc11a3 100644
--- a/indra/llmessage/llxfermanager.cpp
+++ b/indra/llmessage/llxfermanager.cpp
@@ -757,7 +757,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
LLUUID uuid;
LLAssetType::EType type;
S16 type_s16;
- BOOL b_use_big_packets;
+ bool b_use_big_packets;
mesgsys->getBOOL("XferID", "UseBigPackets", b_use_big_packets);
@@ -853,7 +853,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
}
LL_INFOS("Xfer") << "starting file transfer: " << expanded_filename << " to " << mesgsys->getSender() << LL_ENDL;
- BOOL delete_local_on_completion = FALSE;
+ bool delete_local_on_completion = false;
mesgsys->getBOOL("XferID", "DeleteOnCompletion", delete_local_on_completion);
// -1 chunk_size causes it to use the default
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 5de29ba66f..5e24061959 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -3673,13 +3673,13 @@ void LLMessageSystem::getU8(const char *block, const char *var, U8 &u,
LLMessageStringTable::getInstance()->getString(var), u, blocknum);
}
-void LLMessageSystem::getBOOLFast(const char *block, const char *var, BOOL &b,
+void LLMessageSystem::getBOOLFast(const char *block, const char *var, bool &b,
S32 blocknum)
{
mMessageReader->getBOOL(block, var, b, blocknum);
}
-void LLMessageSystem::getBOOL(const char *block, const char *var, BOOL &b,
+void LLMessageSystem::getBOOL(const char *block, const char *var, bool &b,
S32 blocknum)
{
getBOOLFast(LLMessageStringTable::getInstance()->getString(block),
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index e25a9ea7ef..c041a69d79 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -599,8 +599,8 @@ public:
*/
void getBinaryDataFast(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX);
void getBinaryData(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX);
- void getBOOLFast( const char *block, const char *var, BOOL &data, S32 blocknum = 0);
- void getBOOL( const char *block, const char *var, BOOL &data, S32 blocknum = 0);
+ void getBOOLFast( const char *block, const char *var, bool &data, S32 blocknum = 0);
+ void getBOOL( const char *block, const char *var, bool &data, S32 blocknum = 0);
void getS8Fast( const char *block, const char *var, S8 &data, S32 blocknum = 0);
void getS8( const char *block, const char *var, S8 &data, S32 blocknum = 0);
void getU8Fast( const char *block, const char *var, U8 &data, S32 blocknum = 0);
--
cgit v1.2.3