diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-02-02 10:07:04 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-02-02 10:07:04 +0000 |
| commit | 9d7455f9844e293dff8b7902f0c2553094f2f976 (patch) | |
| tree | dfb2f65d0932332b217c19dd22ed62d18e70e2c9 /include/gtest/internal/gtest-internal.h | |
| parent | 40d0ba7a62a8bc749fbaf0747621b0aa10ddf1b9 (diff) | |
| download | googletest-9d7455f9844e293dff8b7902f0c2553094f2f976.tar.gz googletest-9d7455f9844e293dff8b7902f0c2553094f2f976.tar.bz2 googletest-9d7455f9844e293dff8b7902f0c2553094f2f976.zip | |
Adds null check for file locations in XML output printer.
Diffstat (limited to 'include/gtest/internal/gtest-internal.h')
| -rw-r--r-- | include/gtest/internal/gtest-internal.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h index 23fcef78..9f890faa 100644 --- a/include/gtest/internal/gtest-internal.h +++ b/include/gtest/internal/gtest-internal.h @@ -536,20 +536,6 @@ GTEST_API_ AssertionResult IsHRESULTFailure(const char* expr, #endif // GTEST_OS_WINDOWS -// Formats a source file path and a line number as they would appear -// in a compiler error message. -inline String FormatFileLocation(const char* file, int line) { - const char* const file_name = file == NULL ? "unknown file" : file; - if (line < 0) { - return String::Format("%s:", file_name); - } -#ifdef _MSC_VER - return String::Format("%s(%d):", file_name, line); -#else - return String::Format("%s:%d:", file_name, line); -#endif // _MSC_VER -} - // Types of SetUpTestCase() and TearDownTestCase() functions. typedef void (*SetUpTestCaseFunc)(); typedef void (*TearDownTestCaseFunc)(); |