ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 090003a

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

Change-Id: Ibad9225be050ff04077889a7b83cdf232112fb37
This commit is contained in:
Christopher Wiley 2016-04-19 22:37:47 +00:00 • committed by android-build-merger
commit df38f5e209
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