am 61b8cd95: Merge "Remove direct dependence on stlport"
* commit '61b8cd95dcd8e4ebda7df65e9fb1d8512c7baa7a':
Remove direct dependence on stlport
diff --git a/include/nativehelper/UniquePtr.h b/include/nativehelper/UniquePtr.h
index e27e941..50f75b2 100644
--- a/include/nativehelper/UniquePtr.h
+++ b/include/nativehelper/UniquePtr.h
@@ -17,9 +17,13 @@
#ifndef UNIQUE_PTR_H_included
#define UNIQUE_PTR_H_included
-#include <algorithm> // For std::swap
#include <cstdlib> // For NULL.
+// 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 {