diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2017-08-09 14:10:02 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-10 14:40:52 +0000 |
| commit | e6c67cd64a80bd67c587ad3ffb380fe1b7574d1f (patch) | |
| tree | 14f27ef6173fc1585a5d295f57fe4e517330a009 | |
| parent | 4454ce7c74558f610962c6d41d446f50875603ad (diff) | |
| download | pdfium-e6c67cd64a80bd67c587ad3ffb380fe1b7574d1f.tar.xz | |
Make CFX_ByteString(ostringstream) const.
Change-Id: I782379cc7f93b93ed34a5d0a39ee2f198c650465
Reviewed-on: https://pdfium-review.googlesource.com/10430
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
| -rw-r--r-- | core/fxcrt/cfx_bytestring.cpp | 9 | ||||
| -rw-r--r-- | core/fxcrt/cfx_bytestring.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/fxcrt/cfx_bytestring.cpp b/core/fxcrt/cfx_bytestring.cpp index f6634fc51d..c29d24affd 100644 --- a/core/fxcrt/cfx_bytestring.cpp +++ b/core/fxcrt/cfx_bytestring.cpp @@ -10,6 +10,7 @@ #include <algorithm> #include <cctype> +#include <string> #include "core/fxcrt/cfx_string_pool_template.h" #include "core/fxcrt/fx_codepage.h" @@ -195,9 +196,11 @@ CFX_ByteString::CFX_ByteString( } } -CFX_ByteString::CFX_ByteString(std::ostringstream& outStream) - : CFX_ByteString(outStream.str().c_str(), - static_cast<int>(outStream.tellp())) {} +CFX_ByteString::CFX_ByteString(const std::ostringstream& outStream) { + std::string str = outStream.str(); + if (str.length() > 0) + m_pData.Reset(StringData::Create(str.c_str(), str.length())); +} CFX_ByteString::~CFX_ByteString() {} diff --git a/core/fxcrt/cfx_bytestring.h b/core/fxcrt/cfx_bytestring.h index 3f96c2f2f6..cf688b4c88 100644 --- a/core/fxcrt/cfx_bytestring.h +++ b/core/fxcrt/cfx_bytestring.h @@ -46,7 +46,7 @@ class CFX_ByteString { explicit CFX_ByteString(const CFX_ByteStringC& bstrc); CFX_ByteString(const CFX_ByteStringC& bstrc1, const CFX_ByteStringC& bstrc2); CFX_ByteString(const std::initializer_list<CFX_ByteStringC>& list); - explicit CFX_ByteString(std::ostringstream& outStream); + explicit CFX_ByteString(const std::ostringstream& outStream); ~CFX_ByteString(); |