summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2016-04-29 22:57:26 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-04-29 22:57:26 +0000
commitbf80a0678e9c0cfda87deffac5012cb69956e6dc (patch)
treee4f76c105b347a55caf1d32bb1e2542826525afd
parente07a0b0c6b694ddd2d101cff6bc04ec93a6c8125 (diff)
parent471118ef120cb075ccba9e307e2c1b9b5a584840 (diff)
Merge "Fix google-explicit-constructor warnings."
-rw-r--r--compiler/driver/compiler_driver.cc2
-rw-r--r--runtime/gc/space/image_space.cc4
-rw-r--r--runtime/quick_exception_handler.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 4d622bdddf..1ab1d31f09 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -947,7 +947,7 @@ bool CompilerDriver::ShouldVerifyClassBasedOnProfile(const DexFile& dex_file,
class ResolveCatchBlockExceptionsClassVisitor : public ClassVisitor {
public:
- ResolveCatchBlockExceptionsClassVisitor(
+ explicit ResolveCatchBlockExceptionsClassVisitor(
std::set<std::pair<uint16_t, const DexFile*>>& exceptions_to_resolve)
: exceptions_to_resolve_(exceptions_to_resolve) {}
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 1a33d1f89d..78c570fa99 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -880,7 +880,7 @@ class FixupObjectVisitor : public FixupVisitor {
class ForwardObjectAdapter {
public:
- ALWAYS_INLINE ForwardObjectAdapter(const FixupVisitor* visitor) : visitor_(visitor) {}
+ ALWAYS_INLINE explicit ForwardObjectAdapter(const FixupVisitor* visitor) : visitor_(visitor) {}
template <typename T>
ALWAYS_INLINE T* operator()(T* src) const {
@@ -893,7 +893,7 @@ class ForwardObjectAdapter {
class ForwardCodeAdapter {
public:
- ALWAYS_INLINE ForwardCodeAdapter(const FixupVisitor* visitor)
+ ALWAYS_INLINE explicit ForwardCodeAdapter(const FixupVisitor* visitor)
: visitor_(visitor) {}
template <typename T>
diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc
index 237fdaab0e..a3e1f0020a 100644
--- a/runtime/quick_exception_handler.cc
+++ b/runtime/quick_exception_handler.cc
@@ -611,7 +611,7 @@ void QuickExceptionHandler::DoLongJump(bool smash_caller_saves) {
// Prints out methods with their type of frame.
class DumpFramesWithTypeStackVisitor FINAL : public StackVisitor {
public:
- DumpFramesWithTypeStackVisitor(Thread* self, bool show_details = false)
+ explicit DumpFramesWithTypeStackVisitor(Thread* self, bool show_details = false)
SHARED_REQUIRES(Locks::mutator_lock_)
: StackVisitor(self, nullptr, StackVisitor::StackWalkKind::kIncludeInlinedFrames),
show_details_(show_details) {}