diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 10:17:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 10:17:09 -0700 |
| commit | 06b975928878a7a10cd4bc2bb35d2738e453f4a1 (patch) | |
| tree | b0c5b19fce9ae66b8071bd1b3b9a1e2175365358 /googlemock/src/gmock_main.cc | |
| parent | 51b65058ad72d2d92fff89f04aad99f8bbddb147 (diff) | |
| parent | 997d343dd680e541ef96ce71ee54a91daf2577a0 (diff) | |
| download | googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.gz googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.tar.bz2 googletest-06b975928878a7a10cd4bc2bb35d2738e453f4a1.zip | |
Merge branch 'master' into ignore-cmake-generated-files
Diffstat (limited to 'googlemock/src/gmock_main.cc')
| -rw-r--r-- | googlemock/src/gmock_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index 61821592..a3a271e6 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + #include <iostream> #include "gmock/gmock.h" @@ -37,7 +36,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 |