Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Unified Diff: core/include/fpdfdoc/fpdf_doc.h

Issue 1545183002: Merge to XFA: Switch from nonstd::unique_ptr to std::unique_ptr. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: xfa Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/include/fpdfdoc/fpdf_doc.h
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 3934cfd6af6d783668c5f75800c7c398acd3cb75..ce05588f5448f62b86edf9aca02be3edd6b799e1 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -8,11 +8,11 @@
#define CORE_INCLUDE_FPDFDOC_FPDF_DOC_H_
#include <map>
+#include <memory>
#include <vector>
#include "core/include/fpdfapi/fpdf_parser.h"
#include "core/include/fpdfapi/fpdf_render.h"
-#include "third_party/base/nonstd_unique_ptr.h"
class CFieldTree;
class CPDF_AAction;
@@ -700,7 +700,7 @@ class CPDF_InterForm : public CFX_PrivateData {
std::map<const CPDF_Dictionary*, CPDF_FormControl*> m_ControlMap;
- nonstd::unique_ptr<CFieldTree> m_pFieldTree;
+ std::unique_ptr<CFieldTree> m_pFieldTree;
CFX_ByteString m_bsEncoding;
@@ -1068,7 +1068,7 @@ class CPDF_Metadata {
const CXML_Element* GetRoot() const;
private:
- nonstd::unique_ptr<CXML_Element> m_pXmlElement;
+ std::unique_ptr<CXML_Element> m_pXmlElement;
};
class CPDF_ViewerPreferences {

Powered by Google App Engine
This is Rietveld 408576698