From 85c8e7f788512ce5b5b43cd816e8091b57c3d5e7 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 21 Nov 2016 13:50:32 -0500 Subject: Fixup lint flags. The -build/include setting was masking out build/include_what_you_use. This CL restores them, fixes any build errors, and adds NOLINT as needed. As well, the runtime/explicit and runtime/printf flags are aslo enabled and NOLINT'd. lint cleanups Change-Id: Ib013b3eb29c8d0e48cad74c5df9028684130719f Reviewed-on: https://pdfium-review.googlesource.com/2030 Reviewed-by: Tom Sepez --- core/fxcrt/cfx_weak_ptr.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/fxcrt/cfx_weak_ptr.h') diff --git a/core/fxcrt/cfx_weak_ptr.h b/core/fxcrt/cfx_weak_ptr.h index f679696992..43ae5b881d 100644 --- a/core/fxcrt/cfx_weak_ptr.h +++ b/core/fxcrt/cfx_weak_ptr.h @@ -9,6 +9,7 @@ #include #include +#include #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_system.h" @@ -19,10 +20,11 @@ class CFX_WeakPtr { CFX_WeakPtr() {} CFX_WeakPtr(const CFX_WeakPtr& that) : m_pHandle(that.m_pHandle) {} CFX_WeakPtr(CFX_WeakPtr&& that) { Swap(that); } - CFX_WeakPtr(std::unique_ptr pObj) + explicit CFX_WeakPtr(std::unique_ptr pObj) : m_pHandle(new Handle(std::move(pObj))) {} // Deliberately implicit to allow passing nullptr. + // NOLINTNEXTLINE(runtime/explicit) CFX_WeakPtr(std::nullptr_t arg) {} explicit operator bool() const { return m_pHandle && !!m_pHandle->Get(); } -- cgit v1.2.3