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/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp') diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp index ae61736fbbb3..22918561692c 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -20,7 +20,6 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" -#include "llvm/ADT/StringSwitch.h" #include "llvm/Support/Casting.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/Errno.h" @@ -923,7 +922,7 @@ const char *PythonException::toCString() const { PythonException::PythonException(const char *caller) { assert(PyErr_Occurred()); - m_exception_type = m_exception = m_traceback = m_repr_bytes = NULL; + m_exception_type = m_exception = m_traceback = m_repr_bytes = nullptr; PyErr_Fetch(&m_exception_type, &m_exception, &m_traceback); PyErr_NormalizeException(&m_exception_type, &m_exception, &m_traceback); PyErr_Clear(); @@ -951,7 +950,7 @@ void PythonException::Restore() { } else { PyErr_SetString(PyExc_Exception, toCString()); } - m_exception_type = m_exception = m_traceback = NULL; + m_exception_type = m_exception = m_traceback = nullptr; } PythonException::~PythonException() { -- cgit v1.3