summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-10-10 13:21:47 (GMT)
committerGennadiy Civil <misterg@google.com>2019-10-10 13:21:47 (GMT)
commit5395345ca4f0c596110188688ed990e0de5a181c (patch)
tree418dbcc9e69fea355efecaf8648abf387c80c25f /googlemock
parentcb1d5db1a104c7161fce89483dcfbe0ccb9bb28b (diff)
parent2ed2211db99ab4f3e4d11078c78ad48a5b692f02 (diff)
downloadgoogletest-5395345ca4f0c596110188688ed990e0de5a181c.zip
googletest-5395345ca4f0c596110188688ed990e0de5a181c.tar.gz
googletest-5395345ca4f0c596110188688ed990e0de5a181c.tar.bz2
Merge pull request #2497 from thejcannon:handle_null_filename
PiperOrigin-RevId: 273585229
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/src/gmock-spec-builders.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index f9d3434..81ea989 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -36,14 +36,17 @@
#include "gmock/gmock-spec-builders.h"
#include <stdlib.h>
+
#include <iostream> // NOLINT
#include <map>
#include <memory>
#include <set>
#include <string>
#include <vector>
+
#include "gmock/gmock.h"
#include "gtest/gtest.h"
+#include "gtest/internal/gtest-port.h"
#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
# include <unistd.h> // NOLINT
@@ -70,7 +73,8 @@ GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity,
const char* file, int line,
const std::string& message) {
::std::ostringstream s;
- s << file << ":" << line << ": " << message << ::std::endl;
+ s << internal::FormatFileLocation(file, line) << " " << message
+ << ::std::endl;
Log(severity, s.str(), 0);
}