diff options
author | tisi1988 <tisi1988@gmail.com> | 2018-08-07 11:12:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 11:12:00 +0200 |
commit | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (patch) | |
tree | f38bcb2d7e6ae7353fa09aae5ba59cc3019ae1e8 /googlemock/src/gmock_main.cc | |
parent | 25e1436b087ac2b05a4b5eeb0a2704a53016be2d (diff) | |
parent | 28b71e444c41ad93225145e029db4957f15aaae6 (diff) | |
download | googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.gz googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.tar.bz2 googletest-e9b05a4d6aa7f471cbb1bd30c3b9792c939de127.zip |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src/gmock_main.cc')
-rw-r--r-- | googlemock/src/gmock_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index bd5be03b..61821592 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -37,7 +37,7 @@ // 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: -// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464 // NOLINT +// 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 |