commit 9438025454f353c519cc5378eead38f149b85a21
author Chih-Hung Hsieh <chh@google.com> Mon Apr 25 22:38:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 25 22:38:37 2016 +0000
tree 19c5a43389ebe305713349875cb004b38e0f7336
parent 6d67593160c397ca72956487c1bb86cc7668b0de
parent 12a0bd2164045af969720471f1098acf0ec19b09

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

* commit 'f9660191f03a7e2ee83064c5240e97a82a482769':
  Fix google-explicit-constructor warnings.

Change-Id: I9fb5f687858dba101fd6f3f5e728cce2d4d815e9

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