From ece97e28829228d84d6af87ec58b8ea71e9e9637 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Jul 2008 20:07:36 +0000 Subject: [PATCH] remove the just added assertEquals(time_t, long) overload, it results in infinite recursion and crash if time_t is the same type as long git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cppunit.h | 11 ----------- tests/datetime/datetimetest.cpp | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/wx/cppunit.h b/include/wx/cppunit.h index abf423e3f9..503ed3e8e0 100644 --- a/include/wx/cppunit.h +++ b/include/wx/cppunit.h @@ -116,17 +116,6 @@ assertEquals(int expected, assertEquals(size_t(expected), actual, sourceLine, message); } -// and another, slightly different, for checking that result of potentially -// different time_t type is the same as given time_t value -inline void -assertEquals(time_t expected, - long actual, - CppUnit::SourceLine sourceLine, - const std::string& message) -{ - assertEquals(expected, time_t(actual), sourceLine, message); -} - CPPUNIT_NS_END // Use this macro to compare a wxArrayString with the pipe-separated elements diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp index 6add06a431..48611e4480 100644 --- a/tests/datetime/datetimetest.cpp +++ b/tests/datetime/datetimetest.cpp @@ -761,7 +761,7 @@ void DateTimeTestCase::TestTimeTicks() // GetValue() returns internal UTC-based representation, we need to // convert it to local TZ before comparing - long ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset(); + time_t ticks = (dt.GetValue() / 1000).ToLong() + TZ_LOCAL.GetOffset(); if ( dt.IsDST() ) ticks += 3600; CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks + tzOffset );