diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-03-16 19:10:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-16 19:10:47 -0700 |
| commit | 4eb7fbb250feb34a7fe0df1eb2f4b76945d65c8b (patch) | |
| tree | 0e5529d5d71ca567aebdcf3d358b4b14a3e7cb98 /tools | |
| parent | dea50f05e43b2ad6ea392d7ddfbfa691f6903734 (diff) | |
| parent | 8a9cfcc85260eadcc2c17c4a8911c6d93b642f39 (diff) | |
| download | frameworks_base-4eb7fbb250feb34a7fe0df1eb2f4b76945d65c8b.zip frameworks_base-4eb7fbb250feb34a7fe0df1eb2f4b76945d65c8b.tar.gz frameworks_base-4eb7fbb250feb34a7fe0df1eb2f4b76945d65c8b.tar.bz2 | |
Merge "Make StringPool entry types trivially movable."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/StringPool.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index 86044ed..ef86528 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/StringPool.h @@ -13,6 +13,7 @@ #include <androidfw/ResourceTypes.h> #include <utils/String16.h> #include <utils/TextOutput.h> +#include <utils/TypeHelpers.h> #include <sys/types.h> #include <sys/stat.h> @@ -193,5 +194,13 @@ private: Vector<size_t> mOriginalPosToNewPos; }; +// The entry types are trivially movable because all fields they contain, including +// the vectors and strings, are trivially movable. +namespace android { + ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry); + ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style_span); + ANDROID_TRIVIAL_MOVE_TRAIT(StringPool::entry_style); +}; + #endif |