diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-02-17 20:03:14 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-02-17 20:03:14 (GMT) |
| commit | d1763746b65cc7349d4ed9478befdb651aa24589 (patch) | |
| tree | dccf25e2d913e2cea30c222b4bfea8639005fb8b /src | |
| parent | 4674e0dc4faaa8535fa8b2726764fa5f914eb050 (diff) | |
| parent | 71eaf652bacf74d9379f97e5c7c9da79b5ef6fe0 (diff) | |
| download | Ninja-d1763746b65cc7349d4ed9478befdb651aa24589.zip Ninja-d1763746b65cc7349d4ed9478befdb651aa24589.tar.gz Ninja-d1763746b65cc7349d4ed9478befdb651aa24589.tar.bz2 | |
Merge pull request #1110 from G4m4/explicit_std_prefix
Fix ambiguous call to set_terminate on Windows platform
Diffstat (limited to 'src')
| -rw-r--r-- | src/ninja.cc | 2 |
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. |