diff options
Diffstat (limited to 'lldb/source/Core')
| -rw-r--r-- | lldb/source/Core/DataExtractor.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Core/Scalar.cpp | 4 | ||||
| -rw-r--r-- | lldb/source/Core/StreamString.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lldb/source/Core/DataExtractor.cpp b/lldb/source/Core/DataExtractor.cpp index 9e447983301..a8843767fa5 100644 --- a/lldb/source/Core/DataExtractor.cpp +++ b/lldb/source/Core/DataExtractor.cpp @@ -142,8 +142,8 @@ DataExtractor::DataExtractor () : // The data must stay around as long as this object is valid. //---------------------------------------------------------------------- DataExtractor::DataExtractor (const void* data, offset_t length, ByteOrder endian, uint32_t addr_size, uint32_t target_byte_size/*=1*/) : - m_start ((uint8_t*)data), - m_end ((uint8_t*)data + length), + m_start (const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(data))), + m_end (const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(data)) + length), m_byte_order(endian), m_addr_size (addr_size), m_data_sp (), @@ -287,7 +287,7 @@ DataExtractor::SetData (const void *bytes, offset_t length, ByteOrder endian) } else { - m_start = (uint8_t *)bytes; + m_start = const_cast<uint8_t *>(reinterpret_cast<const uint8_t *>(bytes)); m_end = m_start + length; } return GetByteSize(); diff --git a/lldb/source/Core/Scalar.cpp b/lldb/source/Core/Scalar.cpp index 879c7eb30c7..e16f74b19ae 100644 --- a/lldb/source/Core/Scalar.cpp +++ b/lldb/source/Core/Scalar.cpp @@ -264,7 +264,7 @@ Scalar::GetBytes() const case e_ulonglong: case e_sint128: case e_uint128: - return (void *)m_integer.getRawData(); + return const_cast<void *>(reinterpret_cast<const void *>(m_integer.getRawData())); case e_float: flt_val = m_float.convertToFloat(); return (void *)&flt_val; @@ -273,7 +273,7 @@ Scalar::GetBytes() const return (void *)&dbl_val; case e_long_double: llvm::APInt ldbl_val = m_float.bitcastToAPInt(); - return (void *)ldbl_val.getRawData(); + return const_cast<void *>(reinterpret_cast<const void *>(ldbl_val.getRawData())); } return NULL; } diff --git a/lldb/source/Core/StreamString.cpp b/lldb/source/Core/StreamString.cpp index ef2b70583eb..36e086b0b43 100644 --- a/lldb/source/Core/StreamString.cpp +++ b/lldb/source/Core/StreamString.cpp @@ -37,7 +37,7 @@ StreamString::Flush () size_t StreamString::Write (const void *s, size_t length) { - m_packet.append ((char *)s, length); + m_packet.append (reinterpret_cast<const char *>(s), length); return length; } |
