diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-24 19:13:32 -0800 |
| commit | aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 (patch) | |
| tree | a5a435608eb527db39e2c9324737bd230e762030 /core/src/fpdfdoc | |
| parent | 25ae22692cdd5b4ae4783ecb27eba79b3c794b2c (diff) | |
| download | pdfium-aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776.tar.xz | |
Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr.
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/1547833002 .
(cherry picked from commit d20dfba2ae10e8aeb328328f09da79ff904110a8)
Review URL: https://codereview.chromium.org/1545183002 .
Diffstat (limited to 'core/src/fpdfdoc')
| -rw-r--r-- | core/src/fpdfdoc/doc_annot.cpp | 1 | ||||
| -rw-r--r-- | core/src/fpdfdoc/doc_bookmark.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index f4a75e6afc..814496ff7f 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -6,7 +6,6 @@ #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfdoc/fpdf_doc.h" -#include "third_party/base/nonstd_unique_ptr.h" CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) : m_pDocument(pPage->m_pDocument) { diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp index c59b1955a8..b435fc619c 100644 --- a/core/src/fpdfdoc/doc_bookmark.cpp +++ b/core/src/fpdfdoc/doc_bookmark.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include <memory> #include <vector> #include "core/include/fpdfdoc/fpdf_doc.h" -#include "third_party/base/nonstd_unique_ptr.h" CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild( const CPDF_Bookmark& parent) const { @@ -60,7 +60,7 @@ CFX_WideString CPDF_Bookmark::GetTitle() const { if (!len) { return CFX_WideString(); } - nonstd::unique_ptr<FX_WCHAR[]> buf(new FX_WCHAR[len]); + std::unique_ptr<FX_WCHAR[]> buf(new FX_WCHAR[len]); for (int i = 0; i < len; i++) { FX_WCHAR w = title[i]; buf[i] = w > 0x20 ? w : 0x20; |