summaryrefslogtreecommitdiff
path: root/core/fxcrt/include
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-08 14:38:54 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-08 14:38:54 -0700
commitcfd4d57800835011b028435e064f13c29243d6e6 (patch)
tree59f3aa156ea2dca9ea4f5b0e964bd41fa4f9455e /core/fxcrt/include
parent4c3debb3c91f5842784be30a911b52cdabcab7df (diff)
downloadpdfium-cfd4d57800835011b028435e064f13c29243d6e6.tar.xz
Make converstion explicit from CFX_ByteString to uint8_t*
BUG= Review URL: https://codereview.chromium.org/1868293002
Diffstat (limited to 'core/fxcrt/include')
-rw-r--r--core/fxcrt/include/fx_string.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/core/fxcrt/include/fx_string.h b/core/fxcrt/include/fx_string.h
index 5e3cb45fba..0e3160a9d8 100644
--- a/core/fxcrt/include/fx_string.h
+++ b/core/fxcrt/include/fx_string.h
@@ -180,12 +180,6 @@ class CFX_ByteString {
: nullptr;
}
- // Implicit conversion to uint8_t* -- deprecated.
- operator const uint8_t*() const {
- return m_pData ? reinterpret_cast<const uint8_t*>(m_pData->m_String)
- : nullptr;
- }
-
// Explicit conversion to CFX_ByteStringC.
// Note: |this| must outlive the use of the result.
CFX_ByteStringC AsStringC() const {
@@ -294,7 +288,7 @@ class CFX_ByteString {
};
inline CFX_ByteStringC& CFX_ByteStringC::operator=(const CFX_ByteString& src) {
- m_Ptr = (const uint8_t*)src;
+ m_Ptr = src.raw_str();
m_Length = src.GetLength();
return *this;
}