commit 28da35f502c78ea2ec9376617ec71a06557cda10
author Josh Gao <jmgao@google.com> Wed Aug 31 20:59:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 31 20:59:48 2016 +0000
tree 86da8e924b577303fc746fb28127fff3f9927a2f
parent db88317673f2e4e1e44688564d1404223e4f566c
parent 6e455f8caa061ac298cab8b4ad57fbb8561fe8dd

Merge "base: disallow close() on unique_fd." am: ca82aa7d1e am: 8c23285a85
am: 3c91e09042

Change-Id: I267b3ec4f89c2db3f6b077885df5af9366b9be03

base/include/android-base/unique_fd.h

diff --git a/base/include/android-base/unique_fd.h b/base/include/android-base/unique_fd.h
index 869e60f..c323311 100644
--- a/base/include/android-base/unique_fd.h
+++ b/base/include/android-base/unique_fd.h
@@ -95,4 +95,14 @@
 }  // namespace base
 }  // namespace android
 
+template <typename T>
+int close(const android::base::unique_fd_impl<T>&)
+#if defined(__clang__)
+  __attribute__((__unavailable__(
+#else
+  __attribute__((__error__(
+#endif
+    "close called on unique_fd"
+  )));
+
 #endif  // ANDROID_BASE_UNIQUE_FD_H