diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-07-01 16:53:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-01 16:53:36 +0000 |
| commit | c34fa3d4c9ef162c1b047b9f201f6a2fe19449ac (patch) | |
| tree | 9640275a1a980be1b1719bdda6db4434fa3b67ec | |
| parent | 534583b50d996708681902f756af9eb9884fb3da (diff) | |
| parent | b493daceebe8e71c1f2b468ce32b4412aea3b2a5 (diff) | |
| download | platform_libnativehelper-n-iot-preview-2.tar.gz platform_libnativehelper-n-iot-preview-2.tar.bz2 platform_libnativehelper-n-iot-preview-2.zip | |
Merge "Fix google-explicit-constructor warnings in libnativehelper"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | include/nativehelper/AsynchronousCloseMonitor.h | 2 | ||||
| -rw-r--r-- | include/nativehelper/toStringArray.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/nativehelper/AsynchronousCloseMonitor.h b/include/nativehelper/AsynchronousCloseMonitor.h index eefbbdf..0eae752 100644 --- a/include/nativehelper/AsynchronousCloseMonitor.h +++ b/include/nativehelper/AsynchronousCloseMonitor.h @@ -43,7 +43,7 @@ */ class AsynchronousCloseMonitor { public: - AsynchronousCloseMonitor(int fd); + explicit AsynchronousCloseMonitor(int fd); ~AsynchronousCloseMonitor(); bool wasSignaled() const; diff --git a/include/nativehelper/toStringArray.h b/include/nativehelper/toStringArray.h index 9dc7a16..cb46024 100644 --- a/include/nativehelper/toStringArray.h +++ b/include/nativehelper/toStringArray.h @@ -47,14 +47,14 @@ jobjectArray toStringArray(JNIEnv* env, Counter* counter, Getter* getter) { struct VectorCounter { const std::vector<std::string>& strings; - VectorCounter(const std::vector<std::string>& strings) : strings(strings) {} + explicit VectorCounter(const std::vector<std::string>& strings) : strings(strings) {} size_t operator()() { return strings.size(); } }; struct VectorGetter { const std::vector<std::string>& strings; - VectorGetter(const std::vector<std::string>& strings) : strings(strings) {} + explicit VectorGetter(const std::vector<std::string>& strings) : strings(strings) {} const char* operator()(size_t i) { return strings[i].c_str(); } |
