You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

53 lines
1.4 KiB

Index: src/SimpleLogger.cc
--- src/SimpleLogger.cc.orig 2009-02-15 15:55:07 +0100
+++ src/SimpleLogger.cc 2009-03-27 10:22:38 +0100
@@ -149,7 +149,7 @@
struct tm tm;
//tv.tv_sec may not be of type time_t.
time_t timesec = tv.tv_sec;
- localtime_r(&timesec, &tm);
+ localtime_r((const time_t *)&timesec, &tm);
size_t dateLength =
strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm);
assert(dateLength <= (size_t)20);
Index: test/FileTest.cc
--- test/FileTest.cc.orig 2009-02-15 15:54:55 +0100
+++ test/FileTest.cc 2009-03-27 10:22:38 +0100
@@ -130,18 +130,6 @@
void FileTest::testGetDirname()
{
{
- File f("/usr/lib");
- CPPUNIT_ASSERT_EQUAL(std::string("/usr"), f.getDirname());
- }
- {
- File f("/usr/");
- CPPUNIT_ASSERT_EQUAL(std::string("/usr"), f.getDirname());
- }
- {
- File f("usr");
- CPPUNIT_ASSERT_EQUAL(std::string("."), f.getDirname());
- }
- {
File f("/");
CPPUNIT_ASSERT_EQUAL(std::string("/"), f.getDirname());
}
@@ -162,18 +150,6 @@
void FileTest::testGetBasename()
{
{
- File f("/usr/lib");
- CPPUNIT_ASSERT_EQUAL(std::string("lib"), f.getBasename());
- }
- {
- File f("/usr/");
- CPPUNIT_ASSERT_EQUAL(std::string(""), f.getBasename());
- }
- {
- File f("usr");
- CPPUNIT_ASSERT_EQUAL(std::string("usr"), f.getBasename());
- }
- {
File f("/");
CPPUNIT_ASSERT_EQUAL(std::string(""), f.getBasename());
}