diff options
| author | Loo Rong Jie <loorongjie@gmail.com> | 2018-08-09 20:08:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 20:08:44 +0800 |
| commit | 24786cb498231a441fc8f50400272b8868d3610d (patch) | |
| tree | 5e6ae62f4e4e4994bfa43fbe6634f6b4dbb9ce73 /googlemock/src | |
| parent | 61f949387e1bb1cad4bf551f291d861214fb251c (diff) | |
| parent | 4de57ce787989d821d0736c5a12188eeaea3bf2d (diff) | |
| download | googletest-24786cb498231a441fc8f50400272b8868d3610d.tar.gz googletest-24786cb498231a441fc8f50400272b8868d3610d.tar.bz2 googletest-24786cb498231a441fc8f50400272b8868d3610d.zip | |
Merge branch 'master' into deprecate
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index 61821592..32ab534c 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -37,7 +37,8 @@ // 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 +// 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 |