From aa8bf7e42b8c73a9bc07ed6781364ba05f5a9776 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 24 Dec 2015 19:13:32 -0800 Subject: 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 . --- xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xfa/src/fxbarcode/oned') diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 1a6afa7e1e..662e773af3 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -22,10 +22,11 @@ #include "BC_OneDimWriter.h" +#include + #include "../BC_Writer.h" #include "../barcode.h" #include "../common/BC_CommonBitMatrix.h" -#include "third_party/base/nonstd_unique_ptr.h" CBC_OneDimWriter::CBC_OneDimWriter() { m_locTextLoc = BC_TEXT_LOC_BELOWEMBED; @@ -132,7 +133,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text, FX_FLOAT geWidth, int32_t fontSize, FX_FLOAT& charsLen) { - nonstd::unique_ptr encoding( + std::unique_ptr encoding( FX_CreateFontEncodingEx(cFont)); int32_t length = text.GetLength(); -- cgit v1.2.3