commit 95b57180078d9decf47180cdf963b1341fe74614
author peter <peterghost86@gmail.com> Wed Jun 26 07:25:19 2019 -0700
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Wed Jun 26 07:29:35 2019 -0700
tree c5e84bc2fc569825e6bfecf69457463cdf539762
parent fde75a33e19fbefc54f3a6f44e4e97a0c40f912e

Prevent VS from emitting errors when using swap in Optional.h (#22182)

Summary:
Fixes https://github.com/pytorch/pytorch/issues/21706
Pull Request resolved: https://github.com/pytorch/pytorch/pull/22182

Differential Revision: D15981740

Pulled By: ezyang

fbshipit-source-id: d58b3ca3aea8d3d383150208b87fa4bbd4f6fe33

c10/util/Optional.h

diff --git a/c10/util/Optional.h b/c10/util/Optional.h
index adde895..5a90096 100644
--- a/c10/util/Optional.h
+++ b/c10/util/Optional.h
@@ -516,7 +516,7 @@
   // 20.5.4.4, Swap
   void swap(optional<T>& rhs) noexcept(
       std::is_nothrow_move_constructible<T>::value&& noexcept(
-          swap(std::declval<T&>(), std::declval<T&>()))) {
+          std::swap(std::declval<T&>(), std::declval<T&>()))) {
     if (initialized() == true && rhs.initialized() == false) {
       rhs.initialize(std::move(**this));
       clear();