diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-07 10:04:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-07 10:04:48 -0700 |
commit | 8506852a17ed8f092335e13889b21388790f0cc9 (patch) | |
tree | 2156f28dcd7ae71c5327f977e1aaf3b1fd832d20 /googlemock/src | |
parent | dd06b16e76b8f520dc506f8c273fb47b4cf4bedd (diff) | |
parent | b345bf9090961139971775105fa120cc87d63e44 (diff) | |
download | googletest-8506852a17ed8f092335e13889b21388790f0cc9.tar.gz googletest-8506852a17ed8f092335e13889b21388790f0cc9.tar.bz2 googletest-8506852a17ed8f092335e13889b21388790f0cc9.zip |
Merge pull request #1705 from gennadiycivil/master
Formatting changes,small cleanup, no functionality changes
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 |