diff options
author | Abseil Team <absl-team@google.com> | 2018-04-23T15·17-0700 |
---|---|---|
committer | Derek Mauro <dmauro@google.com> | 2018-04-23T16·57-0400 |
commit | af7882601aad93ada881486eeaabc562f1733961 (patch) | |
tree | e9a52b01ef69c7654a97d66c8d60377c851ae817 /absl/strings | |
parent | 94ce52d46c171683b1ee22d14277a6d3bdfd7c4c (diff) |
- fd5f3d7077270ffc5ea74cdb9e18bbae3b9b46aa Fix typo optional -> variant by Abseil Team <absl-team@google.com>
- 9136c06dfa8dbfdde0a427ad3509e34763d607a6 Fix string_view_test and str_cat_test build under MSVC de... by Derek Mauro <dmauro@google.com> - a463820f9441888f4368aa87328599e3209f9b07 Removes constexpr optional<T>::operator->(). This was don... by Abseil Team <absl-team@google.com> - 3bf78a7f126daafff329f7815d507422f1ca378d Remove dependencies on external CCTZ project. by Shaindel Schwartz <shaindel@google.com> - a4ae574a11b1ddf6e88459af3d638cf79aea7ecd Internal change by Jon Cohen <cohenjon@google.com> GitOrigin-RevId: fd5f3d7077270ffc5ea74cdb9e18bbae3b9b46aa Change-Id: I6ab8ab99863716fe9b2745a12ef285f7a6da6d1e
Diffstat (limited to 'absl/strings')
-rw-r--r-- | absl/strings/str_cat_test.cc | 2 | ||||
-rw-r--r-- | absl/strings/string_view_test.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/absl/strings/str_cat_test.cc b/absl/strings/str_cat_test.cc index 58ab743ac13b..c86a5952fab0 100644 --- a/absl/strings/str_cat_test.cc +++ b/absl/strings/str_cat_test.cc @@ -206,6 +206,8 @@ struct Mallocator { typedef Mallocator<U> other; }; Mallocator() = default; + template <class U> + Mallocator(const Mallocator<U>&) {} // NOLINT(runtime/explicit) T* allocate(size_t n) { return static_cast<T*>(std::malloc(n * sizeof(T))); } void deallocate(T* p, size_t) { std::free(p); } diff --git a/absl/strings/string_view_test.cc b/absl/strings/string_view_test.cc index a26f6c3ae119..bb149d5c224c 100644 --- a/absl/strings/string_view_test.cc +++ b/absl/strings/string_view_test.cc @@ -50,6 +50,8 @@ struct Mallocator { typedef Mallocator<U> other; }; Mallocator() = default; + template <class U> + Mallocator(const Mallocator<U>&) {} // NOLINT(runtime/explicit) T* allocate(size_t n) { return static_cast<T*>(std::malloc(n * sizeof(T))); } void deallocate(T* p, size_t) { std::free(p); } |