| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ | 5 #ifndef MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ |
| 6 #define MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ | 6 #define MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "mojo/public/cpp/bindings/array_traits.h" | 10 #include "mojo/public/cpp/bindings/array_traits.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 return input[index]; | 36 return input[index]; |
| 37 } | 37 } |
| 38 | 38 |
| 39 static typename std::vector<T>::const_reference GetAt( | 39 static typename std::vector<T>::const_reference GetAt( |
| 40 const std::vector<T>& input, | 40 const std::vector<T>& input, |
| 41 size_t index) { | 41 size_t index) { |
| 42 return input[index]; | 42 return input[index]; |
| 43 } | 43 } |
| 44 | 44 |
| 45 static bool Resize(std::vector<T>& input, size_t size) { | 45 static bool Resize(std::vector<T>& input, size_t size) { |
| 46 input.resize(size); | 46 if (input.size() != size) { |
| 47 // This is a hack to make compilers for Mac and Android happy. They |
| 48 // currently don't allow resizing types like |
| 49 // std::vector<std::vector<MoveOnlyType>>. |
| 50 // Because the deserialization code doesn't care about the original |
| 51 // contents of |input|, we discard them directly. |
| 52 std::vector<T> temp(size); |
| 53 input.swap(temp); |
| 54 } |
| 55 |
| 47 return true; | 56 return true; |
| 48 } | 57 } |
| 49 }; | 58 }; |
| 50 | 59 |
| 51 } // namespace mojo | 60 } // namespace mojo |
| 52 | 61 |
| 53 #endif // MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ | 62 #endif // MOJO_PUBLIC_CPP_BINDINGS_ARRAY_TRAITS_STL_H_ |
| OLD | NEW |