Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
3957b889
Commit
3957b889
authored
Nov 27, 2019
by
Krystian Kuzniarek
Browse files
Revert "remove MSVC workaround: wmain link error in the static library"
This reverts commit
298a40f0
.
parent
967d8e05
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
googlemock/src/gmock_main.cc
googlemock/src/gmock_main.cc
+9
-2
No files found.
googlemock/src/gmock_main.cc
View file @
3957b889
...
@@ -48,13 +48,20 @@ void loop() { RUN_ALL_TESTS(); }
...
@@ -48,13 +48,20 @@ void loop() { RUN_ALL_TESTS(); }
#endif
#endif
#else
#else
#if __MSC_VER
// MS C++ compiler/linker has a bug on Windows (not on Windows CE), which
// causes a link error when _tmain is defined in a static library and UNICODE
// is enabled. For this reason instead of _tmain, main function is used on
// Windows. See the following link to track the current status of this bug:
// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
// // NOLINT
#if GTEST_OS_WINDOWS_MOBILE
# include <tchar.h> // NOLINT
# include <tchar.h> // NOLINT
GTEST_API_
int
_tmain
(
int
argc
,
TCHAR
**
argv
)
{
GTEST_API_
int
_tmain
(
int
argc
,
TCHAR
**
argv
)
{
#else
#else
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
GTEST_API_
int
main
(
int
argc
,
char
**
argv
)
{
#endif //
__MSC_VER
#endif //
GTEST_OS_WINDOWS_MOBILE
std
::
cout
<<
"Running main() from gmock_main.cc
\n
"
;
std
::
cout
<<
"Running main() from gmock_main.cc
\n
"
;
// Since Google Mock depends on Google Test, InitGoogleMock() is
// Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's
// also responsible for initializing Google Test. Therefore there's
...
...
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