diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-08-09 10:58:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 10:58:22 +0200 |
| commit | efe27ac05c66c3fafad0ac0d279543f640ab30f7 (patch) | |
| tree | 16176eb282cf59332274120eb3b5d53da3f233e2 /googlemock/src/gmock_main.cc | |
| parent | e9b05a4d6aa7f471cbb1bd30c3b9792c939de127 (diff) | |
| parent | 4de57ce787989d821d0736c5a12188eeaea3bf2d (diff) | |
| download | googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.tar.gz googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.tar.bz2 googletest-efe27ac05c66c3fafad0ac0d279543f640ab30f7.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src/gmock_main.cc')
| -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 |