From e3b557809604d036af6e00c60f012c2025b59a5e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 11 Feb 2023 13:38:04 +0100 Subject: Vendor import of llvm-project main llvmorg-16-init-18548-gb0daacf58f41, the last commit before the upstream release/17.x branch was created. --- lldb/source/Commands/CommandObjectWatchpoint.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lldb/source/Commands/CommandObjectWatchpoint.cpp') diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index f87a171daca6..8df8aca04e4a 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -196,7 +196,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_list_options); + return llvm::ArrayRef(g_watchpoint_list_options); } // Instance variables to hold the values for command options. @@ -479,7 +479,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_delete_options); + return llvm::ArrayRef(g_watchpoint_delete_options); } // Instance variables to hold the values for command options. @@ -605,7 +605,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_ignore_options); + return llvm::ArrayRef(g_watchpoint_ignore_options); } // Instance variables to hold the values for command options. @@ -730,7 +730,7 @@ public: } llvm::ArrayRef GetDefinitions() override { - return llvm::makeArrayRef(g_watchpoint_modify_options); + return llvm::ArrayRef(g_watchpoint_modify_options); } // Instance variables to hold the values for command options. @@ -1083,7 +1083,7 @@ protected: options.SetUnwindOnError(true); options.SetKeepInMemory(false); options.SetTryAllThreads(true); - options.SetTimeout(llvm::None); + options.SetTimeout(std::nullopt); ExpressionResults expr_result = target->EvaluateExpression(expr, frame, valobj_sp, options); -- cgit v1.3