diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
| commit | 9d77e63e125a24e8ba6cbe02b40681a37f59cd5f (patch) | |
| tree | 5b4f48b7b3fd7c99e702774ffc53da0f3822613e /googlemock/src/gmock_main.cc | |
| parent | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (diff) | |
| parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
| download | googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.gz googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.bz2 googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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 |