diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-01 11:09:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 11:09:34 -0400 |
| commit | 16c65a476a125b12cc9cda34ae32ce09bc643dc6 (patch) | |
| tree | 3ee12a206ab4eb3960b77e30d09f3e0c6e7f55a4 /googlemock/src | |
| parent | e69a1a83402dfe7c963b9df5c1d15184fd2fab06 (diff) | |
| parent | 572b07ff8d93164b2819fa1800e8ee5bf08537db (diff) | |
| download | googletest-16c65a476a125b12cc9cda34ae32ce09bc643dc6.tar.gz googletest-16c65a476a125b12cc9cda34ae32ce09bc643dc6.tar.bz2 googletest-16c65a476a125b12cc9cda34ae32ce09bc643dc6.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src')
| -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 |