summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-06-30 21:53:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-30 21:53:52 +0000
commit0e2ce383d2c84be1cd1b31cf039f1bbc880d8d8b (patch)
tree9eabddb9469c8486ab6c4f47dbc0dba70870fd02
parent5dcee4ca87aa2a429769db75c795ec7a59530f3c (diff)
parent6857c2c0a8fd3dd0ab7443cc46ccac43224f4fa5 (diff)
downloadbsdiff-0e2ce383d2c84be1cd1b31cf039f1bbc880d8d8b.tar.gz
Merge \\"Fix google-explicit-constructor warnings in bsdiff\\" am: 58632a3b7c
am: 6857c2c0a8 Change-Id: I03c82315091d0d211b4fbbe6c1dc426af1466cc1
-rw-r--r--file.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/file.h b/file.h
index e9659c7..ad1fd2f 100644
--- a/file.h
+++ b/file.h
@@ -29,7 +29,7 @@ class File : public FileInterface {
private:
// Creates the File instance for the |fd|. Takes ownership of the file
// descriptor.
- File(int fd);
+ explicit File(int fd);
int fd_;
};