summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-14 22:33:03 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2009-10-14 22:33:03 (GMT)
commit060804deb8c05b5ea5735b875eaea2c7493e2262 (patch)
treec3499832d2951338fe843bfcceb51c934a9ee100 /src
parent9007cb4f8af796f545fe7e1f552e78bf7296d18a (diff)
downloadgoogletest-060804deb8c05b5ea5735b875eaea2c7493e2262.zip
googletest-060804deb8c05b5ea5735b875eaea2c7493e2262.tar.gz
googletest-060804deb8c05b5ea5735b875eaea2c7493e2262.tar.bz2
Fixes: Scons build file broken when used in another SConstruct; warning in VC 8.0 when compiled with /Wp64
Diffstat (limited to 'src')
-rw-r--r--src/gtest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gtest.cc b/src/gtest.cc
index 9340724..55f03ce 100644
--- a/src/gtest.cc
+++ b/src/gtest.cc
@@ -3170,7 +3170,8 @@ void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream,
for (;;) {
const char* const next_segment = strstr(segment, "]]>");
if (next_segment != NULL) {
- stream->write(segment, next_segment - segment);
+ stream->write(
+ segment, static_cast<std::streamsize>(next_segment - segment));
*stream << "]]>]]&gt;<![CDATA[";
segment = next_segment + strlen("]]>");
} else {