Don't need swap anymore.

The declaration of std::swap here is inconsistent with the one in
libc++ (noexcept differences). Rather than worrying about keeping them
all consistent, just remove swap. It was only ever added for ART, and
ART now uses std::unique_ptr instead.

This was causing an ambiguous overload error in system/core.

Change-Id: I4cf4c41c5dda01a96915e8309af2f8be089d1a2a

1 files changed, 0 insertions, 10 deletions

diff --git a/include/nativehelper/UniquePtr.h b/include/nativehelper/UniquePtr.h
index 7890d52..ac88be1 100644
--- a/include/nativehelper/UniquePtr.h
+++ b/include/nativehelper/UniquePtr.h
@@ -20,11 +20,6 @@
 #include <cstdlib> // For NULL.
 #include "JNIHelp.h"  // For DISALLOW_COPY_AND_ASSIGN.
 
-// This is a fake declaration of std::swap to avoid including <algorithm>
-namespace std {
-template <class T> void swap(T&, T&);
-}
-
 // Default deleter for pointer types.
 template <typename T>
 struct DefaultDelete {
@@ -86,11 +81,6 @@ public:
         }
     }
 
-    // Swap with another unique pointer.
-    void swap(UniquePtr<T>& other) {
-      std::swap(mPtr, other.mPtr);
-    }
-
 private:
     // The raw pointer.
     T* mPtr;