commit d23910a6da3bbf7d6cf1564778a67e66567e7d1c
author Slava Shklyaev <slavash@google.com> Fri Oct 02 21:06:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 02 21:06:58 2020 +0000
tree b9d163b6e71840b92baf36d355d11e283b1c2aa3
parent d5a309ad7c10a91fd7f56cbaa949595dfb2bace7
parent 31ed57c908bc1c13ee23870dbc49c0498a3e6000

Implement specialized swap() for expected<T, E> am: f927d5ca7e am: 2e426925ff am: 2081a0d6e3 am: 31ed57c908

Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1446815

Change-Id: Icf4721e918bd10acb97018c16eb8b4ad9c55ba1d

include/android-base/expected.h

diff --git a/include/android-base/expected.h b/include/android-base/expected.h
index 9470344..9668612 100644
--- a/include/android-base/expected.h
+++ b/include/android-base/expected.h
@@ -380,7 +380,7 @@
 
   // Specialized algorithms
   template<class T1, class E1>
-  friend void swap(expected<T1, E1>&, expected<T1, E1>&) noexcept;
+  friend void swap(expected<T1, E1>& x, expected<T1, E1>& y) noexcept(noexcept(x.swap(y)));
 
  private:
   std::variant<value_type, unexpected_type> var_;
@@ -416,6 +416,11 @@
   return y.has_value() || (x.value() != y.error());
 }
 
+template<class T1, class E1>
+void swap(expected<T1, E1>& x, expected<T1, E1>& y) noexcept(noexcept(x.swap(y))) {
+  x.swap(y);
+}
+
 template<class E>
 class _NODISCARD_ expected<void, E> {
  public:
@@ -570,7 +575,7 @@
 
   // Specialized algorithms
   template<class T1, class E1>
-  friend void swap(expected<T1, E1>&, expected<T1, E1>&) noexcept;
+  friend void swap(expected<T1, E1>& x, expected<T1, E1>& y) noexcept(noexcept(x.swap(y)));
 
  private:
   std::variant<std::monostate, unexpected_type> var_;