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

Commit 45736448 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-90a4f04d22924c9f8592517d32d13be3' 

* changes:
  Merge "Merge "Remove has_trivial_move trait from StringPool types" am: d333f283 am: 6f02f57f" into nyc-dev-plus-aosp am: 8ac28b86 am: 350d84d4
  Merge "Remove has_trivial_move trait from StringPool types" am: d333f283 am: 6f02f57f am: 57ef0a40 am: 01496b46
parents baf315e2 50f9f383

tools/aapt/StringPool.h

+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