commit c22df4a4b32a4f0b469a4e5785314ee5e28afefd
author Andreas Gampe <agampe@google.com> Thu Jan 10 13:41:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Jan 10 13:41:55 2019 -0800
tree 591377b58fda6b252e23ce83f87fbfdbf57b24b2
parent d674de8d6670ecc84c5a7e4676bb98548440c71b
parent 3e031005b741f91f7ecdd75b4231cf234104508f

Merge "Libbase: NOLINT legacy unique_fd operator int" am: d9e73a009b am: d3be58f0bc
am: 6776282beb

Change-Id: Iecb06d633d3abd140d185d360add883c083ab05f

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 4e6c879..c8d12cf 100644
--- a/base/include/android-base/unique_fd.h
+++ b/base/include/android-base/unique_fd.h
@@ -103,7 +103,7 @@
   void reset(int new_value = -1) { reset(new_value, nullptr); }
 
   int get() const { return fd_; }
-  operator int() const { return get(); }
+  operator int() const { return get(); }  // NOLINT
 
   int release() __attribute__((warn_unused_result)) {
     tag(fd_, this, nullptr);