|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70981 - branches/release/libs/date_time/xmldoc
From: marshall_at_[hidden]
Date: 2011-04-04 19:29:43
Author: marshall
Date: 2011-04-04 19:29:42 EDT (Mon, 04 Apr 2011)
New Revision: 70981
URL: http://svn.boost.org/trac/boost/changeset/70981
Log:
Merge to release. Fixes #3651 Fixes #4845
Properties modified:
branches/release/libs/date_time/xmldoc/date_class.xml (contents, props changed)
branches/release/libs/date_time/xmldoc/usage_examples.xml (contents, props changed)
Text files modified:
branches/release/libs/date_time/xmldoc/date_class.xml | 4 ++--
branches/release/libs/date_time/xmldoc/usage_examples.xml | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
Modified: branches/release/libs/date_time/xmldoc/date_class.xml
==============================================================================
--- branches/release/libs/date_time/xmldoc/date_class.xml (original)
+++ branches/release/libs/date_time/xmldoc/date_class.xml 2011-04-04 19:29:42 EDT (Mon, 04 Apr 2011)
@@ -336,13 +336,13 @@
<entry><screen></screen></entry>
</row>
<row>
- <entry valign="top" morerows="1"><screen>date end_of_month_day() const</screen></entry>
+ <entry valign="top" morerows="1"><screen>date end_of_month() const</screen></entry>
<entry>Returns the last day of the month for the date.</entry>
</row>
<row>
<entry><screen>date d(2000,Feb,1);
//gets Feb 29 -- 2000 was leap year
-date eom = d.end_of_month_day();</screen></entry>
+date eom = d.end_of_month();</screen></entry>
</row>
</tbody>
</tgroup>
Modified: branches/release/libs/date_time/xmldoc/usage_examples.xml
==============================================================================
--- branches/release/libs/date_time/xmldoc/usage_examples.xml (original)
+++ branches/release/libs/date_time/xmldoc/usage_examples.xml 2011-04-04 19:29:42 EDT (Mon, 04 Apr 2011)
@@ -17,7 +17,7 @@
<programlisting><emphasis role="keyword">using namespace</emphasis> boost::gregorian;
date weekstart(<emphasis role="number">2002</emphasis>,Feb,<emphasis role="number">1</emphasis>);
- date weekend = weekstart + week(<emphasis role="number">1</emphasis>);
+ date weekend = weekstart + weeks(<emphasis role="number">1</emphasis>);
date d2 = d1 + days(<emphasis role="number">5</emphasis>);
date today = day_clock::local_day();
if (d2 >= today) {} <emphasis role="comment">//date comparison operators</emphasis>
@@ -39,7 +39,8 @@
date d5 = next_weekday(d4, Sunday); <emphasis role="comment">//calculate Sunday following d4
//US labor day is first Monday in Sept</emphasis>
- nth_day_of_the_week_in_month labor_day(nth_dow::first,Monday, Sep);
+ <emphasis role="keyword">typedef</emphasis> nth_day_of_the_week_in_month nth_dow;
+ nth_dow labor_day(nth_dow::first,Monday, Sep);
<emphasis role="comment">//calculate a specific date for 2004 from functor</emphasis>
date d6 = labor_day.get_date(<emphasis role="number">2004</emphasis>);
</programlisting>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk