diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-04 13:54:20 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-04 13:54:20 -0800 |
| commit | 030f536009b56dbcc23d284541e51562bd9a6ed3 (patch) | |
| tree | ffa22213bbcf93fa38c4d5741100f82f55236cfa /tools/aapt/ResourceTable.h | |
| parent | 56fde9e70ef850ca7e3f076e52567f5c75b5e7da (diff) | |
Stop using namespace std.
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.
Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
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 eac5dd3f919f..a939dd33e119 100644 --- a/tools/aapt/ResourceTable.h +++ b/tools/aapt/ResourceTable.h @@ -16,8 +16,6 @@ #include <queue> #include <set> -using namespace std; - class XMLNode; class ResourceTable; @@ -28,7 +26,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 @@ -115,7 +113,7 @@ public: * and would mess up iteration order for the existing * resources. */ - queue<CompileResourceWorkItem>& getWorkQueue() { + std::queue<CompileResourceWorkItem>& getWorkQueue() { return mWorkQueue; } @@ -577,10 +575,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 |