Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f28397 am: 6f02f57f12" into nyc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-09-22 20:35:08 +00:00
committed by Android (Google) Code Review
parent b5b69a2004 57ef0a40f1
commit 8ac28b8659
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/aapt/StringPool.h
View File

@@ -12,7 +12,6 @@
#include <androidfw/ResourceTypes.h> #include <androidfw/ResourceTypes.h>
#include <utils/String16.h> #include <utils/String16.h>
#include <utils/TypeHelpers.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -179,13 +178,5 @@ private:
Vector<size_t> mOriginalPosToNewPos; 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 #endif