| commit | d78d20d2d1afb349f17feec1e7ea7be623c46dfd | [log] [tgz] |
|---|---|---|
| author | Greg Kaiser <gkaiser@google.com> | Thu Apr 29 06:23:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 29 06:23:39 2021 +0000 |
| tree | 29b348c25163f9cf2f8941f2351ac0e7e01b35a6 | |
| parent | 3b90636d0955d79c4c0cd5788692882b6cf1ad61 [diff] | |
| parent | de0d84ec357a72311718aa60403ea42b0afa94c8 [diff] |
Merge "Revert "unique_fd: easier to forward declare"" am: 9d599c3ec6 am: 9d64cee049 am: de0d84ec35 Original change: https://android-review.googlesource.com/c/platform/system/libbase/+/1690407 Change-Id: I87ff394dac9ccb07e56d9408c14f1a63a83fddc5
diff --git a/include/android-base/unique_fd.h b/include/android-base/unique_fd.h index 6d89c07..9ceb5db 100644 --- a/include/android-base/unique_fd.h +++ b/include/android-base/unique_fd.h
@@ -85,7 +85,7 @@ }; template <typename Closer> -class unique_fd_impl { +class unique_fd_impl final { public: unique_fd_impl() {} @@ -175,9 +175,7 @@ } }; -class unique_fd final : public unique_fd_impl<DefaultCloser> { - using unique_fd_impl::unique_fd_impl; -}; +using unique_fd = unique_fd_impl<DefaultCloser>; #if !defined(_WIN32)