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/include/fxcodec/fx_codec.h | |
| 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/include/fxcodec/fx_codec.h')
| -rw-r--r-- | core/include/fxcodec/fx_codec.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index da9cd9260b..b0c1d5710a 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -8,12 +8,13 @@ #define CORE_INCLUDE_FXCODEC_FX_CODEC_H_ #include <map> +#include <memory> #include <vector> #include "core/include/fxcodec/fx_codec_def.h" #include "core/include/fxcrt/fx_basic.h" #include "core/include/fxcrt/fx_coordinates.h" // For FX_RECT. -#include "third_party/base/nonstd_unique_ptr.h" +#include "fx_codec_def.h" class CFX_DIBSource; class CJPX_Decoder; @@ -80,19 +81,19 @@ class CCodec_ModuleMgr { #endif // PDF_ENABLE_XFA protected: - nonstd::unique_ptr<ICodec_BasicModule> m_pBasicModule; - nonstd::unique_ptr<ICodec_FaxModule> m_pFaxModule; - nonstd::unique_ptr<ICodec_JpegModule> m_pJpegModule; - nonstd::unique_ptr<ICodec_JpxModule> m_pJpxModule; - nonstd::unique_ptr<ICodec_Jbig2Module> m_pJbig2Module; - nonstd::unique_ptr<ICodec_IccModule> m_pIccModule; + std::unique_ptr<ICodec_BasicModule> m_pBasicModule; + std::unique_ptr<ICodec_FaxModule> m_pFaxModule; + std::unique_ptr<ICodec_JpegModule> m_pJpegModule; + std::unique_ptr<ICodec_JpxModule> m_pJpxModule; + std::unique_ptr<ICodec_Jbig2Module> m_pJbig2Module; + std::unique_ptr<ICodec_IccModule> m_pIccModule; #ifdef PDF_ENABLE_XFA - nonstd::unique_ptr<ICodec_PngModule> m_pPngModule; - nonstd::unique_ptr<ICodec_GifModule> m_pGifModule; - nonstd::unique_ptr<ICodec_BmpModule> m_pBmpModule; - nonstd::unique_ptr<ICodec_TiffModule> m_pTiffModule; + std::unique_ptr<ICodec_PngModule> m_pPngModule; + std::unique_ptr<ICodec_GifModule> m_pGifModule; + std::unique_ptr<ICodec_BmpModule> m_pBmpModule; + std::unique_ptr<ICodec_TiffModule> m_pTiffModule; #endif // PDF_ENABLE_XFA - nonstd::unique_ptr<ICodec_FlateModule> m_pFlateModule; + std::unique_ptr<ICodec_FlateModule> m_pFlateModule; }; class ICodec_BasicModule { public: |