From e26bbbb9eee140ba24402fe872a752b42f0077de Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 13 Sep 2007 15:08:02 +0000 Subject: [PATCH] Merged stable-0.11 branch changes r15 into the trunk. --- ChangeLog | 5 +++++ test/HttpHeaderProcessorTest.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d58bd385..6ef39e4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-14 Tatsuhiro Tsujikawa + + Fixed the compilation error on 64bit platform. + * test/HttpHeaderProcessorTest.cc + 2007-09-12 Tatsuhiro Tsujikawa Merged Ross's patch that fixes compilation problem in MinGW diff --git a/test/HttpHeaderProcessorTest.cc b/test/HttpHeaderProcessorTest.cc index 846c8195..16f7b4b0 100644 --- a/test/HttpHeaderProcessorTest.cc +++ b/test/HttpHeaderProcessorTest.cc @@ -105,7 +105,7 @@ void HttpHeaderProcessorTest::testGetHttpStatusHeader() CPPUNIT_ASSERT_EQUAL(string("200"), status); CPPUNIT_ASSERT_EQUAL(string("Mon, 25 Jun 2007 16:04:59 GMT"), header->getFirst("Date")); CPPUNIT_ASSERT_EQUAL(string("Apache/2.2.3 (Debian)"), header->getFirst("Server")); - CPPUNIT_ASSERT_EQUAL(9187LL, header->getFirstAsLLInt("Content-Length")); + CPPUNIT_ASSERT_EQUAL((int64_t)9187LL, header->getFirstAsLLInt("Content-Length")); CPPUNIT_ASSERT_EQUAL(string("text/html; charset=UTF-8"), header->getFirst("Content-Type")); }