IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-26 02:40:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some gcc don't like having a struct ymd and a ymd() member function.

Browse Source
This commit is contained in:
John Ralls 2015-04-30 12:23:25 -07:00
parent f87f9ca02d
commit 9fbc447f74
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libqof/qof/gnc-date.cpp
View File

@ -1400,7 +1400,7 @@ GDate* gnc_g_date_new_today ()
{
GncDate gncd;
gncd.today();
auto ymd = gncd.ymd();
auto ymd = gncd.year_month_day();
auto month = static_cast<GDateMonth>(ymd.month);
auto result = g_date_new_dmy (ymd.day, month, ymd.year);
g_assert(g_date_valid (result));

8
src/libqof/qof/gnc-datetime.cpp
View File

@ -64,13 +64,13 @@ public:
GncDateImpl(Date d) : m_greg(d) {}
void today() { m_greg = boost::gregorian::day_clock::local_day(); }
ymd ymd() const;
ymd year_month_day() const;
private:
Date m_greg;
};
ymd
GncDateImpl::ymd() const
GncDateImpl::year_month_day() const
{
auto boost_ymd = m_greg.year_month_day();
return {boost_ymd.year, boost_ymd.month.as_number(), boost_ymd.day};
@ -229,9 +229,9 @@ GncDate::today()
}
ymd
GncDate::ymd() const
GncDate::year_month_day() const
{
return m_impl->ymd();
return m_impl->year_month_day();
}
GncDateTime::GncDateTime() : m_impl(new GncDateTimeImpl) {}

2
src/libqof/qof/gnc-datetime.hpp
View File

@ -68,7 +68,7 @@ public:/** Construct a GncDate representing the current day.
/** Get the year, month, and day from the date as a ymd.
@return ymd struct
*/
ymd ymd() const;
ymd year_month_day() const;
/** Test that the Date has an implementation. */
bool isnull (void) { return m_impl == nullptr; }

4
src/libqof/qof/test/gtest-gnc-datetime.cpp
View File

@ -77,12 +77,12 @@ TEST(gnc_datetime_functions, test_format)
EXPECT_EQ(atime.format("%d-%m-%Y"), "13-11-2045");
}
//This is a bit convoluted because it uses GncDate's GncDateImpl constructor and ymd() function. There's no good way to test the former without violating the privacy of the implementation.
//This is a bit convoluted because it uses GncDate's GncDateImpl constructor and year_month_day() function. There's no good way to test the former without violating the privacy of the implementation.
TEST(gnc_datetime_functions, test_date)
{
GncDateTime atime(2394187200); //2045-11-13 12:00:00 Z
GncDate gncd = std::move(atime.date());
auto ymd = gncd.ymd();
auto ymd = gncd.year_month_day();
EXPECT_EQ(ymd.year, 2045);
EXPECT_EQ(ymd.month, 11);
EXPECT_EQ(ymd.day, 13);