commit 8a9cfcc85260eadcc2c17c4a8911c6d93b642f39
author Jeff Brown <jeffbrown@google.com> Fri Mar 16 15:24:32 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Fri Mar 16 15:24:32 2012 -0700
tree 7534c55dc00e91b64c61c9a830f5115cb304cad5
parent 543ec1c808e0064371cdf491bb8ff1e08134ed93

Make StringPool entry types trivially movable.

Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958

tools/aapt/StringPool.h

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 @@
     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