commit d3818be40178f1ca4139a2d82ea464d884ac5149
author Chih-Hung Hsieh <chh@google.com> Mon Apr 25 22:59:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 22:59:55 2016 +0000
tree ce58ea18a72abf3ea723b34a1ed8a4f695c6ce14
parent df3e6ac59edbefa3396a497892d42a03b40c27ed
parent 1d7b4ba71f07643570195856eb200f0e660c094d

Merge "Fix google-explicit-constructor warnings." am: f966019 am: e5100e6
am: 2a4a02a

* commit '2a4a02a870bcfb5ecd3c5f9e7077ffe1327623b0':
  Fix google-explicit-constructor warnings.

Change-Id: I4f758494c81043243f84d66c67a9037bd6637691

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; }
 };