Implicitly upcast when initializing Maybe<Own<T>> from Own<U>.

617481a0 · Kenton Varda · Kenton Varda · e6e29122 · 617481a0
Commit 617481a0 authored Sep 25, 2016 by Kenton Varda Committed by Kenton Varda Apr 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

memory.h c++/src/kj/memory.h +2 -0

No files found.
--- a/c++/src/kj/memory.h
+++ b/c++/src/kj/memory.h
@@ -239,6 +239,8 @@ public:

  template <typename U>
  inline Maybe(Maybe<Own<U>>&& other): ptr(mv(other.ptr)) {}
+  template <typename U>
+  inline Maybe(Own<U>&& other): ptr(mv(other)) {}

  inline Maybe(decltype(nullptr)) noexcept: ptr(nullptr) {}