diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-09 17:37:12 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-09 17:37:12 -0800 |
| commit | 99406198ac4921a53425edc73cac67e7b4760895 (patch) | |
| tree | d2f2411dad87d84001202e9a04bb2ed60b725683 /core/include | |
| parent | 520f247443253356b0ce236066fce95e7fad7680 (diff) | |
| download | pdfium-99406198ac4921a53425edc73cac67e7b4760895.tar.xz | |
Move ScopedSetInsertion to third_party/base/stl_util.h
Also move ScopedFileStream, since it isn't specific to the
parser, and belongs with the fxcrt object it manipulates.
R=ochang@chromium.org
Review URL: https://codereview.chromium.org/1780063003 .
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/fpdfapi/fpdf_parser.h | 19 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_ext.h | 6 |
2 files changed, 6 insertions, 19 deletions
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 7d7243c90f..705587c513 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -42,25 +42,6 @@ class IPDF_SecurityHandler; #define FPDFPERM_PRINT_HIGH 0x0800 #define FPDF_PAGE_MAX_NUM 0xFFFFF -// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal. -// Come up or wait for something better. -using ScopedFileStream = - std::unique_ptr<IFX_FileStream, ReleaseDeleter<IFX_FileStream>>; - -template <typename T> -class ScopedSetInsertion { - public: - ScopedSetInsertion(std::set<T>* org_set, T elem) - : m_Set(org_set), m_Entry(elem) { - m_Set->insert(m_Entry); - } - ~ScopedSetInsertion() { m_Set->erase(m_Entry); } - - private: - std::set<T>* const m_Set; - const T m_Entry; -}; - // Indexed by 8-bit char code, contains unicode code points. extern const FX_WORD PDFDocEncoding[256]; diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h index c8afb2b793..689d8e8fc4 100644 --- a/core/include/fxcrt/fx_ext.h +++ b/core/include/fxcrt/fx_ext.h @@ -12,6 +12,12 @@ #include "core/include/fxcrt/fx_basic.h" +// TODO(thestig) Using unique_ptr with ReleaseDeleter is still not ideal. +// Come up or wait for something better. This appears in this file rather +// than fx_stream.h due to include ordering restrictions. +using ScopedFileStream = + std::unique_ptr<IFX_FileStream, ReleaseDeleter<IFX_FileStream>>; + FX_FLOAT FXSYS_tan(FX_FLOAT a); FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x); FX_FLOAT FXSYS_strtof(const FX_CHAR* pcsStr, |