remove MSVC workaround: wmain link error in the static library
This commit is contained in:
parent
f9665846e4
commit
298a40f023
|
@ -48,20 +48,13 @@ 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 // GTEST_OS_WINDOWS_MOBILE
|
#endif // __MSC_VER
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user