Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
googletest
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
googletest
Commits
5f92697d
Commit
5f92697d
authored
Oct 18, 2019
by
Sinclair-John
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Issue 2418
parent
f966ed15
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
gtest.cc
googletest/src/gtest.cc
+4
-1
No files found.
googletest/src/gtest.cc
View file @
5f92697d
...
@@ -83,8 +83,11 @@
...
@@ -83,8 +83,11 @@
# include <windows.h> // NOLINT
# include <windows.h> // NOLINT
# undef min
# undef min
#ifdef _MSC_VER
# include <crtdbg.h> // NOLINT
# include <crtdbg.h> // NOLINT
# include <debugapi.h> // NOLINT
# include <debugapi.h> // NOLINT
#endif
# include <io.h> // NOLINT
# include <io.h> // NOLINT
# include <sys/timeb.h> // NOLINT
# include <sys/timeb.h> // NOLINT
# include <sys/types.h> // NOLINT
# include <sys/types.h> // NOLINT
...
@@ -4908,7 +4911,6 @@ int UnitTest::Run() {
...
@@ -4908,7 +4911,6 @@ int UnitTest::Run() {
_set_abort_behavior
(
_set_abort_behavior
(
0x0
,
// Clear the following flags:
0x0
,
// Clear the following flags:
_WRITE_ABORT_MSG
|
_CALL_REPORTFAULT
);
// pop-up window, core dump.
_WRITE_ABORT_MSG
|
_CALL_REPORTFAULT
);
// pop-up window, core dump.
# endif
// In debug mode, the Windows CRT can crash with an assertion over invalid
// In debug mode, the Windows CRT can crash with an assertion over invalid
// input (e.g. passing an invalid file descriptor). The default handling
// input (e.g. passing an invalid file descriptor). The default handling
...
@@ -4919,6 +4921,7 @@ int UnitTest::Run() {
...
@@ -4919,6 +4921,7 @@ int UnitTest::Run() {
_CRTDBG_MODE_FILE
|
_CRTDBG_MODE_DEBUG
);
_CRTDBG_MODE_FILE
|
_CRTDBG_MODE_DEBUG
);
(
void
)
_CrtSetReportFile
(
_CRT_ASSERT
,
_CRTDBG_FILE_STDERR
);
(
void
)
_CrtSetReportFile
(
_CRT_ASSERT
,
_CRTDBG_FILE_STDERR
);
}
}
# endif
}
}
#endif // GTEST_OS_WINDOWS
#endif // GTEST_OS_WINDOWS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment