diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:57:45 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-22 14:57:45 -0800 |
| commit | 9ba6a147311eacb933c175168de6d11c439985d3 (patch) | |
| tree | a1a75ac52168294f73b6eda5c65c26e4444b4c47 /core/src/fxcodec/jbig2/JBig2_Context.cpp | |
| parent | cd2bb30aba89a05c0bbd4d6973fa070205e3a1e8 (diff) | |
| download | pdfium-9ba6a147311eacb933c175168de6d11c439985d3.tar.xz | |
Merge to XFA: Start using allowed C++11 features.
TBR=dml@google.com, thakis@chromium.org
Review URL: https://codereview.chromium.org/1544923002 .
Review URL: https://codereview.chromium.org/1545823002 .
(cherry picked from commit ba2586d2c0a50df14aa2549a0a841e1d4b9af4b6)
(cherry picked from commit 87f7d29531dabfd66e547a6be31a08272ff631d5)
Review URL: https://codereview.chromium.org/1542213002 .
Diffstat (limited to 'core/src/fxcodec/jbig2/JBig2_Context.cpp')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Context.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.cpp b/core/src/fxcodec/jbig2/JBig2_Context.cpp index 2a28185d88..9503fed95e 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Context.cpp @@ -8,6 +8,7 @@ #include <algorithm> #include <list> +#include <utility> #include <vector> #include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" @@ -1119,7 +1120,7 @@ int32_t CJBig2_Context::parseGenericRegion(CJBig2_Segment* pSegment, } } pGRD->USESKIP = 0; - m_pGRD = nonstd::move(pGRD); + m_pGRD = std::move(pGRD); } pSegment->m_nResultType = JBIG2_IMAGE_POINTER; if (m_pGRD->MMR == 0) { |