From db8971ad6e7c24e853602fcd33d5b498c6bf46ac Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 11 Dec 2009 01:16:12 +0000 Subject: [PATCH] Avoid compiler warnings. git-svn-id: https://svn.dealii.org/trunk@20228 0785d39b-7218-0410-832d-ea1e28bc413d --- .../boost/date_time/gregorian/conversion.hpp | 2 +- .../boost/date_time/posix_time/conversion.hpp | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deal.II/contrib/boost/include/boost/date_time/gregorian/conversion.hpp b/deal.II/contrib/boost/include/boost/date_time/gregorian/conversion.hpp index f35796ee7f..5b0d0ca533 100644 --- a/deal.II/contrib/boost/include/boost/date_time/gregorian/conversion.hpp +++ b/deal.II/contrib/boost/include/boost/date_time/gregorian/conversion.hpp @@ -41,7 +41,7 @@ namespace gregorian { boost::throw_exception(std::out_of_range(s)); } - std::tm datetm = {}; // zero initialization is needed for extension members, like tm_zone + std::tm datetm = std::tm(); // zero initialization is needed for extension members, like tm_zone boost::gregorian::date::ymd_type ymd = d.year_month_day(); datetm.tm_year = ymd.year - 1900; datetm.tm_mon = ymd.month - 1; diff --git a/deal.II/contrib/boost/include/boost/date_time/posix_time/conversion.hpp b/deal.II/contrib/boost/include/boost/date_time/posix_time/conversion.hpp index a7f84d8d83..38a3269a93 100644 --- a/deal.II/contrib/boost/include/boost/date_time/posix_time/conversion.hpp +++ b/deal.II/contrib/boost/include/boost/date_time/posix_time/conversion.hpp @@ -2,7 +2,7 @@ #define POSIX_TIME_CONVERSION_HPP___ /* Copyright (c) 2002-2005 CrystalClear Software, Inc. - * Use, modification and distribution is subject to the + * Use, modification and distribution is 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 @@ -29,21 +29,21 @@ namespace posix_time { return start + seconds(static_cast(t)); } - //! Convert a time to a tm structure truncating any fractional seconds + //! Convert a time to a tm structure truncating any fractional seconds inline std::tm to_tm(const boost::posix_time::ptime& t) { std::tm timetm = boost::gregorian::to_tm(t.date()); boost::posix_time::time_duration td = t.time_of_day(); - timetm.tm_hour = td.hours(); - timetm.tm_min = td.minutes(); + timetm.tm_hour = td.hours(); + timetm.tm_min = td.minutes(); timetm.tm_sec = td.seconds(); - timetm.tm_isdst = -1; // -1 used when dst info is unknown + timetm.tm_isdst = -1; // -1 used when dst info is unknown return timetm; } - //! Convert a time_duration to a tm structure truncating any fractional seconds and zeroing fields for date components + //! Convert a time_duration to a tm structure truncating any fractional seconds and zeroing fields for date components inline std::tm to_tm(const boost::posix_time::time_duration& td) { - std::tm timetm = {}; + std::tm timetm = std::tm(); timetm.tm_hour = date_time::absolute_value(td.hours()); timetm.tm_min = date_time::absolute_value(td.minutes()); timetm.tm_sec = date_time::absolute_value(td.seconds()); @@ -60,12 +60,12 @@ namespace posix_time { #if defined(BOOST_HAS_FTIME) - + //! Function to create a time object from an initialized FILETIME struct. /*! Function to create a time object from an initialized FILETIME struct. - * A FILETIME struct holds 100-nanosecond units (0.0000001). When - * built with microsecond resolution the FILETIME's sub second value - * will be truncated. Nanosecond resolution has no truncation. + * A FILETIME struct holds 100-nanosecond units (0.0000001). When + * built with microsecond resolution the FILETIME's sub second value + * will be truncated. Nanosecond resolution has no truncation. * * \note FILETIME is part of the Win32 API, so it is not portable to non-windows * platforms. -- 2.39.5