diff options
| author | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-17 16:37:41 +0100 |
|---|---|---|
| committer | Krystian Kuzniarek <krystian.kuzniarek@gmail.com> | 2019-11-22 17:45:04 +0100 |
| commit | 298a40f023e6813d2bf73847c3a38ceaf5e46320 (patch) | |
| tree | 505bd7a2dd2baf9dfb5ac12da6b1848dd94cf532 /googlemock | |
| parent | f9665846e405664bec650d77f9dd236c61a293b0 (diff) | |
| download | googletest-298a40f023e6813d2bf73847c3a38ceaf5e46320.tar.gz googletest-298a40f023e6813d2bf73847c3a38ceaf5e46320.tar.bz2 googletest-298a40f023e6813d2bf73847c3a38ceaf5e46320.zip | |
remove MSVC workaround: wmain link error in the static library
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/src/gmock_main.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index 18c500f6..89c81831 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -48,20 +48,13 @@ void loop() { RUN_ALL_TESTS(); } #endif #else - -// 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 +#if __MSC_VER # include <tchar.h> // NOLINT GTEST_API_ int _tmain(int argc, TCHAR** argv) { #else GTEST_API_ int main(int argc, char** argv) { -#endif // GTEST_OS_WINDOWS_MOBILE +#endif // __MSC_VER std::cout << "Running main() from gmock_main.cc\n"; // Since Google Mock depends on Google Test, InitGoogleMock() is // also responsible for initializing Google Test. Therefore there's |