summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-06-30 22:01:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-30 22:01:30 +0000
commitce52661e0b0726bf5c98c2d23c793607e42db4da (patch)
tree9eabddb9469c8486ab6c4f47dbc0dba70870fd02
parent1163dbd0c8e2e9db1d0515206ef0b6ef1844776f (diff)
parentd8b25d290bdd0ac5541bfcfb54fd710066701c4e (diff)
downloadbsdiff-ce52661e0b0726bf5c98c2d23c793607e42db4da.tar.gz
Merge \\\\"Fix google-explicit-constructor warnings in bsdiff\\\\" am: 58632a3b7c am: 6857c2c0a8 am: 0e2ce383d2
am: d8b25d290b Change-Id: Iee1ac51ea19a30d8e2370a4b9aff00180e198594
-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_;
};