diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 10:35:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 10:35:56 -0400 |
| commit | 1dad4cf52123f52896d63c8fd103b6c84bf6ae7c (patch) | |
| tree | 85b7c60880416650d6006d4cdd09c2112d865596 /googlemock/src/gmock_main.cc | |
| parent | 10f05a627c2da8d7de78da1b08f984ce8de398fb (diff) | |
| parent | 490554aa0f3618e1e5dd217f11fe0c3f188ed615 (diff) | |
| download | googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.gz googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.tar.bz2 googletest-1dad4cf52123f52896d63c8fd103b6c84bf6ae7c.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 bd5be03b..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: -// http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=394464 // 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 |