From 71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0 Mon Sep 17 00:00:00 2001 From: g4m4 Date: Wed, 17 Feb 2016 11:35:52 +0100 Subject: Fix ambiguous call to set_terminate on Windows platform On Windows set_terminate() could either be the standard C++ one or (actually the same one but in the global namespace) the CRT one declared in corecrt_terminate.h Hence this ambiguity - this patch solves it. Signed-off-by: g4m4 --- src/ninja.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ninja.cc b/src/ninja.cc index a3f1be0..35f293b 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -1161,7 +1161,7 @@ int main(int argc, char** argv) { #if defined(_MSC_VER) // Set a handler to catch crashes not caught by the __try..__except // block (e.g. an exception in a stack-unwind-block). - set_terminate(TerminateHandler); + std::set_terminate(TerminateHandler); __try { // Running inside __try ... __except suppresses any Windows error // dialogs for errors such as bad_alloc. -- cgit v0.12