summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/date_time/local_time')
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/conversion.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/custom_time_zone.hpp4
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/date_duration_operators.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/dst_transition_day_rules.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/local_date_time.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/local_time.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/local_time_io.hpp4
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/local_time_types.hpp2
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/posix_time_zone.hpp6
-rw-r--r--3rdParty/Boost/src/boost/date_time/local_time/tz_database.hpp2
10 files changed, 13 insertions, 15 deletions
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/conversion.hpp b/3rdParty/Boost/src/boost/date_time/local_time/conversion.hpp
index a530de4..aa0b72c 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/conversion.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/conversion.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2009-06-04 01:24:49 -0700 (Thu, 04 Jun 2009) $
+ * $Date$
*/
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/custom_time_zone.hpp b/3rdParty/Boost/src/boost/date_time/local_time/custom_time_zone.hpp
index 84c59a3..b89218a 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/custom_time_zone.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/custom_time_zone.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2012-09-22 15:33:33 -0700 (Sat, 22 Sep 2012) $
+ * $Date$
*/
#include "boost/date_time/time_zone_base.hpp"
@@ -64,7 +64,7 @@ namespace local_time {
//! True if zone uses daylight savings adjustments
virtual bool has_dst() const
{
- return (dst_calc_rules_); //if calc_rule is set the tz has dst
+ return (bool) dst_calc_rules_; //if calc_rule is set the tz has dst
}
//! Local time that DST starts -- NADT if has_dst is false
virtual posix_time::ptime dst_local_start_time(gregorian::greg_year y) const
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/date_duration_operators.hpp b/3rdParty/Boost/src/boost/date_time/local_time/date_duration_operators.hpp
index b4c325d..e0f170f 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/date_duration_operators.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/date_duration_operators.hpp
@@ -6,7 +6,7 @@
* (See accompanying file LICENSE_1_0.txt or
* http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $
+ * $Date$
*/
#include "boost/date_time/gregorian/greg_duration_types.hpp"
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/dst_transition_day_rules.hpp b/3rdParty/Boost/src/boost/date_time/local_time/dst_transition_day_rules.hpp
index d82731c..f372e44 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/dst_transition_day_rules.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/dst_transition_day_rules.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $
+ * $Date$
*/
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/local_date_time.hpp b/3rdParty/Boost/src/boost/date_time/local_time/local_date_time.hpp
index 96b2915..a3762d9 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/local_date_time.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/local_date_time.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2012-09-22 15:33:33 -0700 (Sat, 22 Sep 2012) $
+ * $Date$
*/
#include <string>
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/local_time.hpp b/3rdParty/Boost/src/boost/date_time/local_time/local_time.hpp
index 162cac5..880989b 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/local_time.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/local_time.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $
+ * $Date$
*/
#include "boost/date_time/posix_time/posix_time.hpp"
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/local_time_io.hpp b/3rdParty/Boost/src/boost/date_time/local_time/local_time_io.hpp
index b5e3c3f..c32b81e 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/local_time_io.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/local_time_io.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-11-13 11:05:31 -0800 (Thu, 13 Nov 2008) $
+ * $Date$
*/
#include <locale>
@@ -36,7 +36,6 @@ namespace local_time {
boost::io::ios_flags_saver iflags(os);
typedef local_date_time time_type;//::utc_time_type typename
typedef date_time::time_facet<time_type, CharT> custom_time_facet;
- typedef std::time_put<CharT> std_time_facet;
std::ostreambuf_iterator<CharT> oitr(os);
if(std::has_facet<custom_time_facet>(os.getloc())) {
@@ -123,7 +122,6 @@ namespace local_time {
const boost::local_time::local_time_period& p) {
boost::io::ios_flags_saver iflags(os);
typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
- typedef std::time_put<CharT> std_time_facet;
std::ostreambuf_iterator<CharT> oitr(os);
if (std::has_facet<custom_facet>(os.getloc())) {
std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/local_time_types.hpp b/3rdParty/Boost/src/boost/date_time/local_time/local_time_types.hpp
index 5e04422..df2d08c 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/local_time_types.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/local_time_types.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $
+ * $Date$
*/
#include "boost/date_time/local_time/local_date_time.hpp"
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/posix_time_zone.hpp b/3rdParty/Boost/src/boost/date_time/local_time/posix_time_zone.hpp
index ee1b553..d0ef31d 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/posix_time_zone.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/posix_time_zone.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0. (See accompanying
* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2012-09-22 15:33:33 -0700 (Sat, 22 Sep 2012) $
+ * $Date$
*/
#include <string>
@@ -430,9 +430,9 @@ namespace local_time{
dst_calc_rules_ = shared_ptr<dst_calc_rule>(
new partial_date_dst_rule(
partial_date_dst_rule::start_rule(
- sd, static_cast<date_time::months_of_year>(sm)),
+ static_cast<unsigned short>(sd), static_cast<date_time::months_of_year>(sm)),
partial_date_dst_rule::end_rule(
- ed, static_cast<date_time::months_of_year>(em))
+ static_cast<unsigned short>(ed), static_cast<date_time::months_of_year>(em))
)
);
}
diff --git a/3rdParty/Boost/src/boost/date_time/local_time/tz_database.hpp b/3rdParty/Boost/src/boost/date_time/local_time/tz_database.hpp
index aceda93..0c6fbbf 100644
--- a/3rdParty/Boost/src/boost/date_time/local_time/tz_database.hpp
+++ b/3rdParty/Boost/src/boost/date_time/local_time/tz_database.hpp
@@ -5,7 +5,7 @@
* Subject to the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
* Author: Jeff Garland, Bart Garst
- * $Date: 2008-02-27 12:00:24 -0800 (Wed, 27 Feb 2008) $
+ * $Date$
*/
#include <string>