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

Commit 57ef0a40 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

Change-Id: Iba0bb317fb0df1e2c5189dde3743f21bdd00ec38
parents a0b58a6c 6f02f57f

tools/aapt/StringPool.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -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