From 43031a38ff7f8ebe8048b136b0529ab0ea625e15 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 20 Jul 2020 21:25:32 -0700 Subject: [PATCH] [lldb] Fix OptionValueFileColonLine to compile with MSVC This should fix error C4716: 'lldb_private::OptionValueFileColonLine::Clear': must return a value --- lldb/include/lldb/Interpreter/OptionValueFileColonLine.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lldb/include/lldb/Interpreter/OptionValueFileColonLine.h b/lldb/include/lldb/Interpreter/OptionValueFileColonLine.h index 6285c03..3c0ccb2 100644 --- a/lldb/include/lldb/Interpreter/OptionValueFileColonLine.h +++ b/lldb/include/lldb/Interpreter/OptionValueFileColonLine.h @@ -1,4 +1,4 @@ -//===-- OptionValueFileColonLine.h -----------------------------------*- C++ -*-===// +//===-- OptionValueFileColonLine.h ------------------------------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -38,7 +38,8 @@ public: bool Clear() override { m_file_spec.Clear(); m_line_number = LLDB_INVALID_LINE_NUMBER; - m_column_number = 0; + m_column_number = LLDB_INVALID_COLUMN_NUMBER; + return true; } lldb::OptionValueSP DeepCopy() const override; @@ -49,7 +50,7 @@ public: FileSpec &GetFileSpec() { return m_file_spec; } uint32_t GetLineNumber() { return m_line_number; } uint32_t GetColumnNumber() { return m_column_number; } - + void SetCompletionMask(uint32_t mask) { m_completion_mask = mask; } protected: -- 2.7.4