diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-05 15:41:39 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-05 15:41:39 -0800 |
| commit | f8d6a4ba8739e16e13ae0014efa099ec564939a7 (patch) | |
| tree | 3359c566008dcbe79e5553503e37a754fea16b1e /tools/aapt/ResourceTable.h | |
| parent | ecc20aafa6f3d272292e7b3577c99f2c127e590f (diff) | |
| parent | 701f9c2fd8d4e31c5ed3a51e4767d4aeb9b20c40 (diff) | |
resolved conflicts for merge of 701f9c2f to stage-aosp-master
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
Diffstat (limited to 'tools/aapt/ResourceTable.h')
| -rw-r--r-- | tools/aapt/ResourceTable.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/aapt/ResourceTable.h b/tools/aapt/ResourceTable.h index eef0ae10e60d..96442248d296 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -17,8 +17,6 @@ #include "StringPool.h" #include "Symbol.h" -using namespace std; - class XMLNode; class ResourceTable; @@ -29,7 +27,7 @@ enum { XML_COMPILE_STRIP_WHITESPACE = 1<<3, XML_COMPILE_STRIP_RAW_VALUES = 1<<4, XML_COMPILE_UTF8 = 1<<5, - + XML_COMPILE_STANDARD_RESOURCE = XML_COMPILE_STRIP_COMMENTS | XML_COMPILE_ASSIGN_ATTRIBUTE_IDS | XML_COMPILE_STRIP_WHITESPACE | XML_COMPILE_STRIP_RAW_VALUES @@ -116,7 +114,7 @@ public: * and would mess up iteration order for the existing * resources. */ - queue<CompileResourceWorkItem>& getWorkQueue() { + std::queue<CompileResourceWorkItem>& getWorkQueue() { return mWorkQueue; } @@ -587,10 +585,10 @@ private: size_t mNumLocal; SourcePos mCurrentXmlPos; Bundle* mBundle; - + // key = string resource name, value = set of locales in which that name is defined - map<String16, map<String8, SourcePos> > mLocalizations; - queue<CompileResourceWorkItem> mWorkQueue; + std::map<String16, std::map<String8, SourcePos>> mLocalizations; + std::queue<CompileResourceWorkItem> mWorkQueue; }; #endif |