Merge "Fix google-explicit-constructor warnings."

2016-04-25 22:22:06 +00:00 · 2016-04-25 22:22:06 +00:00 · f9660191f0
commit f9660191f0
parent d2afbe45e1 1cc82ce95c
2 changed files with 2 additions and 2 deletions
--- a/logcat/tests/logcat_benchmark.cpp
+++ b/logcat/tests/logcat_benchmark.cpp
@ -49,7 +49,7 @@ TEST(logcat, sorted_order) {
            }
        }

-        timestamp(const char *buffer)
+        explicit timestamp(const char *buffer)
        {
            init(buffer);
        }
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@ -380,7 +380,7 @@ public:
            tid(tid),
            padding(0) {
    }
-    LogBufferElementKey(uint64_t key):value(key) { }
+    explicit LogBufferElementKey(uint64_t key):value(key) { }

    uint64_t getKey() { return value; }
 };