[Boost-commit] svn:boost r86225 - in trunk/libs/log: doc src

Subject: [Boost-commit] svn:boost r86225 - in trunk/libs/log: doc src
From: andrey.semashev_at_[hidden]
Date: 2013-10-10 05:44:35

Author: andysem
Date: 2013-10-10 05:44:35 EDT (Thu, 10 Oct 2013)
New Revision: 86225
URL: http://svn.boost.org/trac/boost/changeset/86225

Log:
Fixed parsing RotationTimePoint parameter values from settings, when the time point only included time of day (i.e. daily rotation).

Text files modified: 
   trunk/libs/log/doc/changelog.qbk          |     1 +                                       
   trunk/libs/log/src/init_from_settings.cpp |    11 ++++-------                             
   2 files changed, 5 insertions(+), 7 deletions(-)

Modified: trunk/libs/log/doc/changelog.qbk
==============================================================================
--- trunk/libs/log/doc/changelog.qbk	Thu Oct 10 05:35:37 2013	(r86224)
+++ trunk/libs/log/doc/changelog.qbk	2013-10-10 05:44:35 EDT (Thu, 10 Oct 2013)	(r86225)
@@ -24,6 +24,7 @@
 * Fixed [link log.detailed.attributes.timer `timer`] attribute generating incorrect time readings on Windows on heavy thread contention when `QueryPerformanceCounter` API was used.
 * Fixed a bug in the filter parser that prevented using parsed filters with some attributes. For example, parsed filters didn't work with a string-typed attribute value, if the value was compared to a numeric operand.
 * Fixed thread id formatting discrepancies between the default sink and formatters.
+* Fixed parsing RotationTimePoint parameter values from settings, when the time point only included time of day (i.e. daily rotation).
 * Closed tickets: [ticket 8815], [ticket 8819], [ticket 8915], [ticket 8917], [ticket 9139], [ticket 9140], [ticket 9153], [ticket 9155].
 
 [heading 2.1, Boost 1.54]

Modified: trunk/libs/log/src/init_from_settings.cpp
==============================================================================
--- trunk/libs/log/src/init_from_settings.cpp	Thu Oct 10 05:35:37 2013	(r86224)
+++ trunk/libs/log/src/init_from_settings.cpp	2013-10-10 05:44:35 EDT (Thu, 10 Oct 2013)	(r86225)
@@ -161,13 +161,10 @@
         value.begin(), value.end(),
         (
             -(
-                (
-                    // First check for a weekday
-                    weekday_p[boost::log::as_action(boost::log::bind_assign(weekday))] |
-                    // ... or a day in month
-                    day_p[boost::log::as_action(boost::log::bind_assign(day))]
-                ) >>
-                (+encoding_specific::space)
+                // First check for a weekday
+                (weekday_p >> qi::omit[ +encoding_specific::space ])[boost::log::as_action(boost::log::bind_assign(weekday))] |
+                // ... or a day in month
+                (day_p >> qi::omit[ +encoding_specific::space ])[boost::log::as_action(boost::log::bind_assign(day))]
             ) >>
             // Then goes the time of day
             (