eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "remove MSVC workaround: wmain link error in the static library"

Browse Source 
This reverts commit 298a40f023.
This commit is contained in:
Krystian Kuzniarek 2019-11-27 15:01:03 +01:00
parent 967d8e05c2
commit 3957b8898b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
googlemock/src/gmock_main.cc
View File

@ -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