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

Commit 749181c1 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove has_trivial_move trait from Vector<T>" am: 588b3b0c

am: 85942090

Change-Id: Ic41410047760bff11063d12839921ae008fe7e65
parents 298571ec 85942090
Loading
Loading
Loading
Loading
+0 −7
Original line number Diff line number Diff line
@@ -97,13 +97,6 @@ private:
            SortedVector< key_value_pair_t<KEY, VALUE> >    mVector;
};

// KeyedVector<KEY, VALUE> can be trivially moved using memcpy() because its
// underlying SortedVector can be trivially moved.
template<typename KEY, typename VALUE> struct trait_trivial_move<KeyedVector<KEY, VALUE> > {
    enum { value = trait_trivial_move<SortedVector< key_value_pair_t<KEY, VALUE> > >::value };
};


// ---------------------------------------------------------------------------

/**
+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ protected:
    virtual int     do_compare(const void* lhs, const void* rhs) const;
};

// SortedVector<T> can be trivially moved using memcpy() because moving does not
// require any change to the underlying SharedBuffer contents or reference count.
template<typename T> struct trait_trivial_move<SortedVector<T> > { enum { value = true }; };

// ---------------------------------------------------------------------------
// No user serviceable parts from here...
// ---------------------------------------------------------------------------
+0 −4
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ protected:
    virtual void    do_move_backward(void* dest, const void* from, size_t num) const;
};

// Vector<T> can be trivially moved using memcpy() because moving does not
// require any change to the underlying SharedBuffer contents or reference count.
template<typename T> struct trait_trivial_move<Vector<T> > { enum { value = true }; };

// ---------------------------------------------------------------------------
// No user serviceable parts from here...
// ---------------------------------------------------------------------------