generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-18 03:29:47 +02:00
Code Issues Projects Releases Wiki Activity

date/time test fix; g++ compilation fix for bulk

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2008-06-01 11:02:21 +00:00
parent ded102a6a4
commit cf01c1ad16
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Data/include/Poco/Data/Bulk.h
View File

@@ -40,6 +40,7 @@
#define Data_Bulk_INCLUDED #define Data_Bulk_INCLUDED
#include "Poco/Void.h"
#include "Poco/Data/Limit.h" #include "Poco/Data/Limit.h"
@@ -98,7 +99,7 @@ inline Bulk bulk(const Limit& limit = Limit(Limit::LIMIT_UNLIMITED, false, false
} }
inline void bulk() inline void bulk(Void)
/// Dummy bulk function. Used for bulk binding creation /// Dummy bulk function. Used for bulk binding creation
/// (see BulkBinding) and bulk extraction signalling to Statement. /// (see BulkBinding) and bulk extraction signalling to Statement.
{ {
@@ -108,7 +109,7 @@ inline void bulk()
} // namespace Keywords } // namespace Keywords
typedef void (*BulkFnType)(); typedef void (*BulkFnType)(Void);
} } // namespace Poco::Data } } // namespace Poco::Data

14
Data/testsuite/src/DataTest.cpp
View File

@@ -1067,15 +1067,12 @@ void DataTest::testDateAndTime()
assert (dt.hour() == t.hour()); assert (dt.hour() == t.hour());
assert (dt.minute() == t.minute()); assert (dt.minute() == t.minute());
assert (dt.second() == t.second()); assert (dt.second() == t.second());
Date d1(2007, 6, 15); Date d1(2007, 6, 15);
d1.assign(d.year() - 1, d.month(), d.day()); d1.assign(d.year() - 1, d.month(), d.day());
assert (d1 < d); assert (d1 != d); assert (d1 < d); assert (d1 != d);
if (d.month() > 1)
d1.assign(d.year(), d.month() - 1, d.day()); d1.assign(d.year() - 1, 12, d.day());
else
d1.assign(d.year() - 1, 12, d.day());
assert (d1 < d); assert (d1 != d); assert (d1 < d); assert (d1 != d);
if (d.day() > 1) if (d.day() > 1)
@@ -1087,10 +1084,7 @@ void DataTest::testDateAndTime()
d1.assign(d.year() + 1, d.month(), d.day()); d1.assign(d.year() + 1, d.month(), d.day());
assert (d1 > d); assert (d1 != d); assert (d1 > d); assert (d1 != d);
if (d.month() < 12) d1.assign(d.year() + 1, 1, d.day());
d1.assign(d.year(), d.month() + 1, d.day());
else
d1.assign(d.year() + 1, 1, d.day());
assert (d1 > d); assert (d1 != d); assert (d1 > d); assert (d1 != d);
if (d.day() < dt.daysOfMonth(dt.year(), dt.month())) if (d.day() < dt.daysOfMonth(dt.year(), dt.month()))