diff options
author | Lei Zhang <thestig@chromium.org> | 2018-09-20 01:21:05 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-20 01:21:05 +0000 |
commit | 109aa6d0f673aee11a398aae478fb758fc73a33f (patch) | |
tree | 0ec791dcb33395953b5afb8b667b0a1823daa789 /core/fpdfapi/parser | |
parent | f3cc72fd2b6910d4d7437f71efce23b501c5b526 (diff) | |
download | pdfium-109aa6d0f673aee11a398aae478fb758fc73a33f.tar.xz |
Remove more unneeded STL #includes from headers.
Remove some variables named "string" to avoid false positives from the
linter.
Change-Id: I00a53e6970451fd0cea8ab2f8178183650ca00d2
Reviewed-on: https://pdfium-review.googlesource.com/42810
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfapi/parser')
-rw-r--r-- | core/fpdfapi/parser/cpdf_simple_parser.h | 2 | ||||
-rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.cpp | 4 | ||||
-rw-r--r-- | core/fpdfapi/parser/cpdf_syntax_parser.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/fpdfapi/parser/cpdf_simple_parser.h b/core/fpdfapi/parser/cpdf_simple_parser.h index c8dae23ba6..f9461b644c 100644 --- a/core/fpdfapi/parser/cpdf_simple_parser.h +++ b/core/fpdfapi/parser/cpdf_simple_parser.h @@ -7,8 +7,6 @@ #ifndef CORE_FPDFAPI_PARSER_CPDF_SIMPLE_PARSER_H_ #define CORE_FPDFAPI_PARSER_CPDF_SIMPLE_PARSER_H_ -#include <utility> - #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "third_party/base/span.h" diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp index cc83fa091a..45e0f1730b 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp @@ -403,6 +403,10 @@ ByteString CPDF_SyntaxParser::GetKeyword() { return GetNextWord(nullptr); } +void CPDF_SyntaxParser::SetPos(FX_FILESIZE pos) { + m_Pos = std::min(pos, m_FileLen); +} + std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectBody( CPDF_IndirectObjectHolder* pObjList) { const CPDF_ReadValidator::Session read_session(GetValidator().Get()); diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.h b/core/fpdfapi/parser/cpdf_syntax_parser.h index 92f28d9874..6e6b98c068 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.h +++ b/core/fpdfapi/parser/cpdf_syntax_parser.h @@ -7,7 +7,6 @@ #ifndef CORE_FPDFAPI_PARSER_CPDF_SYNTAX_PARSER_H_ #define CORE_FPDFAPI_PARSER_CPDF_SYNTAX_PARSER_H_ -#include <algorithm> #include <memory> #include <vector> @@ -42,7 +41,7 @@ class CPDF_SyntaxParser { } FX_FILESIZE GetPos() const { return m_Pos; } - void SetPos(FX_FILESIZE pos) { m_Pos = std::min(pos, m_FileLen); } + void SetPos(FX_FILESIZE pos); std::unique_ptr<CPDF_Object> GetObjectBody( CPDF_IndirectObjectHolder* pObjList); |