diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-11-14 00:52:27 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2014-11-14 16:34:58 +0100 |
| commit | 5d1b6d3e0fa4b97a490ef964be48aed9872e3ec1 (patch) | |
| tree | ab5f510c4d83b175681de629395525bf7ec7cedb /deps/v8/test/cctest/cctest.cc | |
| parent | 3b3d89bad26f5dfebe73fef6ae284ee78acbd5c9 (diff) | |
| download | node-new-5d1b6d3e0fa4b97a490ef964be48aed9872e3ec1.tar.gz | |
deps: upgrade v8 to 3.30.37
Diffstat (limited to 'deps/v8/test/cctest/cctest.cc')
| -rw-r--r-- | deps/v8/test/cctest/cctest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/deps/v8/test/cctest/cctest.cc b/deps/v8/test/cctest/cctest.cc index f03710a3b0..170aa5a8a5 100644 --- a/deps/v8/test/cctest/cctest.cc +++ b/deps/v8/test/cctest/cctest.cc @@ -34,12 +34,12 @@ #include "test/cctest/profiler-extension.h" #include "test/cctest/trace-extension.h" -#if (defined(_WIN32) || defined(_WIN64)) +#if V8_OS_WIN #include <windows.h> // NOLINT -#if defined(_MSC_VER) +#if V8_CC_MSVC #include <crtdbg.h> -#endif // defined(_MSC_VER) -#endif // defined(_WIN32) || defined(_WIN64) +#endif +#endif enum InitializationState {kUnset, kUnintialized, kInitialized}; static InitializationState initialization_state_ = kUnset; @@ -47,7 +47,7 @@ static bool disable_automatic_dispose_ = false; CcTest* CcTest::last_ = NULL; bool CcTest::initialize_called_ = false; -bool CcTest::isolate_used_ = false; +v8::base::Atomic32 CcTest::isolate_used_ = 0; v8::Isolate* CcTest::isolate_ = NULL; @@ -145,12 +145,12 @@ static void SuggestTestHarness(int tests) { int main(int argc, char* argv[]) { -#if (defined(_WIN32) || defined(_WIN64)) +#if V8_OS_WIN UINT new_flags = SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX; UINT existing_flags = SetErrorMode(new_flags); SetErrorMode(existing_flags | new_flags); -#if defined(_MSC_VER) +#if V8_CC_MSVC _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); @@ -158,8 +158,8 @@ int main(int argc, char* argv[]) { _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); _set_error_mode(_OUT_TO_STDERR); -#endif // _MSC_VER -#endif // defined(_WIN32) || defined(_WIN64) +#endif // V8_CC_MSVC +#endif // V8_OS_WIN v8::V8::InitializeICU(); v8::Platform* platform = v8::platform::CreateDefaultPlatform(); |