diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-01-13 15:18:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-13 15:18:20 -0800 |
| commit | a5f92d4013eee1973965f13ec366191a219bae23 (patch) | |
| tree | 79aa8075b42ad8d4163a0ba86fa2c4f751f6362d | |
| parent | 15d0bc4756c3b8012cb958ff96a35759504a8f98 (diff) | |
| parent | 4bedb481036fbc6b72e5c0c620b569b508d3be16 (diff) | |
| download | frameworks_base-a5f92d4013eee1973965f13ec366191a219bae23.zip frameworks_base-a5f92d4013eee1973965f13ec366191a219bae23.tar.gz frameworks_base-a5f92d4013eee1973965f13ec366191a219bae23.tar.bz2 | |
am 4bedb481: Merge "Fix compilation with Clang."
* commit '4bedb481036fbc6b72e5c0c620b569b508d3be16':
Fix compilation with Clang.
| -rw-r--r-- | include/utils/TypeHelpers.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/utils/TypeHelpers.h b/include/utils/TypeHelpers.h index 7b4fb70..1f2c2d5 100644 --- a/include/utils/TypeHelpers.h +++ b/include/utils/TypeHelpers.h @@ -233,19 +233,15 @@ struct key_value_pair_t { } }; -template<> template <typename K, typename V> struct trait_trivial_ctor< key_value_pair_t<K, V> > { enum { value = aggregate_traits<K,V>::has_trivial_ctor }; }; -template<> template <typename K, typename V> struct trait_trivial_dtor< key_value_pair_t<K, V> > { enum { value = aggregate_traits<K,V>::has_trivial_dtor }; }; -template<> template <typename K, typename V> struct trait_trivial_copy< key_value_pair_t<K, V> > { enum { value = aggregate_traits<K,V>::has_trivial_copy }; }; -template<> template <typename K, typename V> struct trait_trivial_move< key_value_pair_t<K, V> > { enum { value = aggregate_traits<K,V>::has_trivial_move }; }; |