commit 12a0bd2164045af969720471f1098acf0ec19b09
author Chih-hung Hsieh <chh@google.com> Mon Apr 25 22:22:06 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 25 22:22:06 2016 +0000
tree 19c5a43389ebe305713349875cb004b38e0f7336
parent 209052355cf34780ba7bd0fd0834c8854751eaa7
parent 1d7e5f19c1ebdf41d95549855d1a3b3ecdd60479

Merge "Fix google-explicit-constructor warnings."

logcat/tests/logcat_benchmark.cpp

diff --git a/logcat/tests/logcat_benchmark.cpp b/logcat/tests/logcat_benchmark.cpp
index be815be..dd85164 100644
--- a/logcat/tests/logcat_benchmark.cpp
+++ b/logcat/tests/logcat_benchmark.cpp
@@ -49,7 +49,7 @@
             }
         }
 
-        timestamp(const char *buffer)
+        explicit timestamp(const char *buffer)
         {
             init(buffer);
         }

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 8c30f79..db65978 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -380,7 +380,7 @@
             tid(tid),
             padding(0) {
     }
-    LogBufferElementKey(uint64_t key):value(key) { }
+    explicit LogBufferElementKey(uint64_t key):value(key) { }
 
     uint64_t getKey() { return value; }
 };