diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-01 22:48:05 +0100 |
| commit | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (patch) | |
| tree | 5358fa1f0e6726c0b9a77b985d26f7b431b663b9 /googlemock/src | |
| parent | 3280099951c51b7d2745bd840f2dd9d967cffcda (diff) | |
| parent | e5e2ef7cd27cc089c1d8302a11970ef870554294 (diff) | |
| download | googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.gz googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.tar.bz2 googletest-1cd979a80701a6c8c370f3a69048ba5cbec62a28.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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 |