Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01496b46 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove has_trivial_move trait from StringPool types" am: d333f283 am: 6f02f57f

am: 57ef0a40

Change-Id: If6fab1852e0e9b287a904fe4a4b556167ac0800d
parents 05a9189e 57ef0a40
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@

#include <androidfw/ResourceTypes.h>
#include <utils/String16.h>
#include <utils/TypeHelpers.h>

#include <sys/types.h>
#include <sys/stat.h>
@@ -179,13 +178,5 @@ 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