ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove has_trivial_move trait from Vector<T>" am: 588b3b0c03 am: 85942090f6

Browse source 
am: 749181c10b

Change-Id: Ie339e0ea27463d0c5b093e9a5e262367d1ca57a5
This commit is contained in:
Colin Cross 2016-09-22 22:58:13 +00:00 • committed by android-build-merger
commit 021899fa8a
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/utils/KeyedVector.h
View file

@ -97,13 +97,6 @@ private:
SortedVector< key_value_pair_t<KEY, VALUE> > mVector; 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 };
};
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** /**

4
include/utils/SortedVector.h
View file

@ -133,10 +133,6 @@ protected:
virtual int do_compare(const void* lhs, const void* rhs) const; 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... // No user serviceable parts from here...
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

4
include/utils/Vector.h
View file

@ -207,10 +207,6 @@ protected:
virtual void do_move_backward(void* dest, const void* from, size_t num) const; 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... // No user serviceable parts from here...
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------