diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-17 16:26:03 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-17 16:26:03 -0700 |
| commit | ce4ffb8183af3fa2bb5133f0f7370a88e064c516 (patch) | |
| tree | 16f05f79aed56678b45bea435addaa75fbb9f85f /fpdfsdk/include | |
| parent | 52a48aadc19b2dee8abeb702269bb168eb6b6999 (diff) | |
| download | pdfium-ce4ffb8183af3fa2bb5133f0f7370a88e064c516.tar.xz | |
CFX_MapByteStringToPtr considered harmful.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1297723002 .
Diffstat (limited to 'fpdfsdk/include')
| -rw-r--r-- | fpdfsdk/include/fsdk_annothandler.h | 4 | ||||
| -rw-r--r-- | fpdfsdk/include/javascript/global.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h index c5f2b95533..369a080a9b 100644 --- a/fpdfsdk/include/fsdk_annothandler.h +++ b/fpdfsdk/include/fsdk_annothandler.h @@ -7,6 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_ #define FPDFSDK_INCLUDE_FSDK_ANNOTHANDLER_H_ +#include <map> + #include "../../core/include/fxcrt/fx_basic.h" class CFFL_IFormFiller; @@ -297,7 +299,7 @@ class CPDFSDK_AnnotHandlerMgr { private: CBA_AnnotHandlerArray m_Handlers; - CFX_MapByteStringToPtr m_mapType2Handler; + std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler; CPDFDoc_Environment* m_pApp; }; diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index e881625f56..7f78bb6bcb 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -7,6 +7,8 @@ #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ +#include <map> + #include "JS_Define.h" class CJS_GlobalData; @@ -69,7 +71,7 @@ class JSGlobalAlternate : public CJS_EmbedObj { void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData); private: - CFX_MapByteStringToPtr m_mapGlobal; + std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal; CFX_WideString m_sFilePath; CJS_GlobalData* m_pGlobalData; CPDFDoc_Environment* m_pApp; |