summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2019-05-14 17:07:36 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2019-05-14 17:07:36 +0000
commit1362905e8c4a8fe95dfea81a37a2ad01a95cf926 (patch)
tree4f8ac72535ab56f1d149c256c98eb6537078b345
parent7c5c0c9fe59b77e628024dec48b9db1f36f41c15 (diff)
downloadbcm5719-llvm-1362905e8c4a8fe95dfea81a37a2ad01a95cf926.tar.gz
bcm5719-llvm-1362905e8c4a8fe95dfea81a37a2ad01a95cf926.zip
lldb-server: rename `llgs::terminate` (NFC)
`terminate` overlaps with a C function on Windows: ``` D:\a\1\s\lldb\tools\lldb-server\lldb-server.cpp(45,13): warning: 'terminate' redeclared without 'dllimport' attribute: 'dllexport' attribute added [-Winconsistent-dllimport] static void terminate() { g_debugger_lifetime->Terminate(); } ^ C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\ucrt\corecrt_terminate.h(29,48): note: previous declaration is here _ACRTIMP __declspec(noreturn) void __cdecl terminate() throw(); ^ D:\a\1\s\lldb\tools\lldb-server\lldb-server.cpp(45,61): warning: function declared 'noreturn' should not return [-Winvalid-noreturn] static void terminate() { g_debugger_lifetime->Terminate(); } ^ ``` Rename the function to `terminate_debugger` to avoid the errant match. llvm-svn: 360693
-rw-r--r--lldb/tools/lldb-server/lldb-server.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/tools/lldb-server/lldb-server.cpp b/lldb/tools/lldb-server/lldb-server.cpp
index 5f0aab12a5a..690aa6277bc 100644
--- a/lldb/tools/lldb-server/lldb-server.cpp
+++ b/lldb/tools/lldb-server/lldb-server.cpp
@@ -43,7 +43,7 @@ static void initialize() {
llvm::consumeError(std::move(e));
}
-static void terminate() { g_debugger_lifetime->Terminate(); }
+static void terminate_debugger() { g_debugger_lifetime->Terminate(); }
} // namespace llgs
// main
@@ -63,12 +63,12 @@ int main(int argc, char *argv[]) {
case 'g':
llgs::initialize();
main_gdbserver(argc, argv);
- llgs::terminate();
+ llgs::terminate_debugger();
break;
case 'p':
llgs::initialize();
main_platform(argc, argv);
- llgs::terminate();
+ llgs::terminate_debugger();
break;
case 'v':
fprintf(stderr, "%s\n", lldb_private::GetVersion());
OpenPOWER on IntegriCloud