openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h" am: 090003a 

am: df38f5e

* commit 'df38f5e20948b7dfe75f07346ba2961e25a1c32c':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: I4aebfc31bea7225232636bae56e92a9460a5d6fb
This commit is contained in:
Treehugger Robot 2016-04-19 22:41:06 +00:00 committed by android-build-merger
parent 2af9f2fe82 df38f5e209
commit 9428814b8e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/include/android-base/unique_fd.h
View File

@ -19,7 +19,10 @@
#include <unistd.h>
#include <android-base/macros.h>
// DO NOT INCLUDE OTHER LIBBASE HEADERS!
// This file gets used in libbinder, and libbinder is used everywhere.
// Including other headers from libbase frequently results in inclusion of
// android-base/macros.h, which causes macro collisions.
// Container for a file descriptor that automatically closes the descriptor as
// it goes out of scope.
@ -75,7 +78,8 @@ class unique_fd final {
private:
int value_;
DISALLOW_COPY_AND_ASSIGN(unique_fd);
unique_fd(const unique_fd&);
void operator=(const unique_fd&);
};
} // namespace base