Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-19 20:07:36 +00:00
parent cc209a518f
commit ece97e2882
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/cppunit.h
View File

@@ -116,17 +116,6 @@ assertEquals(int expected,
assertEquals(size_t(expected), actual, sourceLine, message); 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 CPPUNIT_NS_END
// Use this macro to compare a wxArrayString with the pipe-separated elements // Use this macro to compare a wxArrayString with the pipe-separated elements

2
tests/datetime/datetimetest.cpp
View File

@@ -761,7 +761,7 @@ void DateTimeTestCase::TestTimeTicks()
// GetValue() returns internal UTC-based representation, we need to // GetValue() returns internal UTC-based representation, we need to
// convert it to local TZ before comparing // 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() ) if ( dt.IsDST() )
ticks += 3600; ticks += 3600;
CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks + tzOffset ); CPPUNIT_ASSERT_EQUAL( d.gmticks, ticks + tzOffset );