summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-23 14:02:36 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-23 14:03:27 +0200
commitda3bd5a796e187f2e3c3b32d9b95ae0d7b15b423 (patch)
tree84975e1fa99b7765e7f8f54aaa407698e78af131 /indra
parent8346e4984ed338a7bf9c35618edb36194057b8bd (diff)
SL-13599 Resolve gcc v10 'no trivial copy-assigment' warnings
Diffstat (limited to 'indra')
-rw-r--r--indra/llprimitive/llprimitive.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index e08b1914e8..67c225d25d 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -118,7 +118,7 @@ struct material_id_type // originally from llrendermaterialtable
{
material_id_type()
{
- memset(m_value, 0, sizeof(m_value));
+ memset((void*)m_value, 0, sizeof(m_value));
}
bool operator==(const material_id_type& other) const
@@ -1417,7 +1417,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name
if (cur_ptr >= buffer_end || !unpack_TEField<material_id_type>(material_data, tec.face_count, cur_ptr, buffer_end, MVT_LLUUID))
{
- memset(material_data, 0, sizeof(material_data));
+ memset((void*)material_data, 0, sizeof(material_data));
}
for (U32 i = 0; i < tec.face_count; i++)
@@ -1480,7 +1480,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
const U32 MAX_TE_BUFFER = 4096;
U8 packed_buffer[MAX_TE_BUFFER];
- memset(packed_buffer, 0, MAX_TE_BUFFER);
+ memset((void*)packed_buffer, 0, MAX_TE_BUFFER);
LLUUID image_data[MAX_TES];
LLColor4U colors[MAX_TES];
@@ -1494,14 +1494,14 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
U8 glow[MAX_TES];
material_id_type material_data[MAX_TES];
- memset(scale_s, 0, sizeof(scale_s));
- memset(scale_t, 0, sizeof(scale_t));
- memset(offset_s, 0, sizeof(offset_s));
- memset(offset_t, 0, sizeof(offset_t));
- memset(image_rot, 0, sizeof(image_rot));
- memset(bump, 0, sizeof(bump));
- memset(media_flags, 0, sizeof(media_flags));
- memset(glow, 0, sizeof(glow));
+ memset((void*)scale_s, 0, sizeof(scale_s));
+ memset((void*)scale_t, 0, sizeof(scale_t));
+ memset((void*)offset_s, 0, sizeof(offset_s));
+ memset((void*)offset_t, 0, sizeof(offset_t));
+ memset((void*)image_rot, 0, sizeof(image_rot));
+ memset((void*)bump, 0, sizeof(bump));
+ memset((void*)media_flags, 0, sizeof(media_flags));
+ memset((void*)glow, 0, sizeof(glow));
S32 size;
U32 face_count = 0;
@@ -1551,7 +1551,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
if (cur_ptr >= buffer_end || !unpack_TEField<material_id_type>(material_data, face_count, cur_ptr, buffer_end, MVT_LLUUID))
{
- memset(material_data, 0, sizeof(material_data));
+ memset((void*)material_data, 0, sizeof(material_data));
}
for (i = 0; i < face_count; i++)