summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorg4m4 <misept.dieseneuf@gmail.com>2016-02-17 10:35:52 (GMT)
committerg4m4 <misept.dieseneuf@gmail.com>2016-02-17 10:35:52 (GMT)
commit71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0 (patch)
treedccf25e2d913e2cea30c222b4bfea8639005fb8b
parent4674e0dc4faaa8535fa8b2726764fa5f914eb050 (diff)
downloadNinja-71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0.zip
Ninja-71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0.tar.gz
Ninja-71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0.tar.bz2
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 <misept.dieseneuf@gmail.com>
-rw-r--r--src/ninja.cc2
1 files changed, 1 insertions, 1 deletions
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.