diff options
| -rw-r--r-- | lldb/source/Commands/CommandObjectThread.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Plugins/Language/ObjC/Cocoa.cpp | 4 | ||||
| -rw-r--r-- | lldb/tools/debugserver/source/debugserver.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index cfd8fcb7291..687187b26cc 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -209,7 +209,7 @@ protected: Process *process = m_exe_ctx.GetProcessPtr(); Thread *thread = process->GetThreadList().FindThreadByID(tid).get(); if (thread == nullptr) { - result.AppendErrorWithFormat("Failed to process thread# %lu.\n", tid); + result.AppendErrorWithFormat("Failed to process thread# %llu.\n", tid); result.SetStatus(eReturnStatusFailed); return false; } diff --git a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp index 6aaf66cbb48..2ba005e02ad 100644 --- a/lldb/source/Plugins/Language/ObjC/Cocoa.cpp +++ b/lldb/source/Plugins/Language/ObjC/Cocoa.cpp @@ -517,11 +517,11 @@ bool lldb_private::formatters::NSNumberSummaryProvider( bool is_preserved_number = cfinfoa & 0x8; if (is_preserved_number) { - lldbassert(!"We should handle preserved numbers!"); + lldbassert(!static_cast<bool>("We should handle preserved numbers!")); return false; } - type_code = (TypeCodes)(cfinfoa & 0x7); + type_code = static_cast<TypeCodes>(cfinfoa & 0x7); } else { uint8_t data_type = process_sp->ReadUnsignedIntegerFromMemory(valobj_addr + ptr_size, 1, diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp index bc1954de334..318e72e971a 100644 --- a/lldb/tools/debugserver/source/debugserver.cpp +++ b/lldb/tools/debugserver/source/debugserver.cpp @@ -876,8 +876,8 @@ static struct option g_long_options[] = { 'u'}, // If we need to handshake with our parent process, an option will be // passed down that specifies a unix socket name to use {"fd", required_argument, NULL, - 'FDSC'}, // A file descriptor was passed to this process when spawned that - // is already open and ready for communication + '2'}, // A file descriptor was passed to this process when spawned that + // is already open and ready for communication {"named-pipe", required_argument, NULL, 'P'}, {"reverse-connect", no_argument, NULL, 'R'}, {"env", required_argument, NULL, @@ -1261,7 +1261,7 @@ int main(int argc, char *argv[]) { } break; - case 'FDSC': + case '2': // File descriptor passed to this process during fork/exec and is already // open and ready for communication. communication_fd = atoi(optarg); |
