diff options
author | Remko Tronçon <git@el-tramo.be> | 2010-05-06 18:16:19 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2010-05-06 18:16:19 (GMT) |
commit | 0cec4698efdb9fa0072e5d8cbccd6cb806b940e9 (patch) | |
tree | 2cf4a5c259fe410718d4a17669c59b8cb4e81709 /3rdParty/Boost/1_compilation_fix.diff | |
parent | 6629433203dc188a3269b27ee801da5100229ca5 (diff) | |
download | swift-contrib-0cec4698efdb9fa0072e5d8cbccd6cb806b940e9.zip swift-contrib-0cec4698efdb9fa0072e5d8cbccd6cb806b940e9.tar.bz2 |
Apply boost patches.
Diffstat (limited to '3rdParty/Boost/1_compilation_fix.diff')
-rw-r--r-- | 3rdParty/Boost/1_compilation_fix.diff | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/3rdParty/Boost/1_compilation_fix.diff b/3rdParty/Boost/1_compilation_fix.diff deleted file mode 100644 index ad62fe1..0000000 --- a/3rdParty/Boost/1_compilation_fix.diff +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/3rdParty/Boost/src/boost/date_time/gregorian/conversion.hpp b/3rdParty/Boost/src/boost/date_time/gregorian/conversion.hpp -index f35796e..6d4b606 100644 ---- a/3rdParty/Boost/src/boost/date_time/gregorian/conversion.hpp -+++ b/3rdParty/Boost/src/boost/date_time/gregorian/conversion.hpp -@@ -15,6 +15,7 @@ - #include <boost/date_time/c_time.hpp> - #include <boost/date_time/special_defs.hpp> - #include <boost/date_time/gregorian/gregorian_types.hpp> -+#include <cstring> - - namespace boost { - -@@ -41,7 +42,8 @@ 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; -+ memset(&datetm, 0, sizeof(std::tm)); - 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/3rdParty/Boost/src/boost/date_time/posix_time/conversion.hpp b/3rdParty/Boost/src/boost/date_time/posix_time/conversion.hpp -index 9cdb864..a7b1a80 100644 ---- a/3rdParty/Boost/src/boost/date_time/posix_time/conversion.hpp -+++ b/3rdParty/Boost/src/boost/date_time/posix_time/conversion.hpp -@@ -15,6 +15,7 @@ - #include <boost/date_time/c_time.hpp> - #include <boost/date_time/time_resolution_traits.hpp> // absolute_value - #include <boost/date_time/gregorian/conversion.hpp> -+#include <cstring> - - namespace boost { - -@@ -43,7 +44,8 @@ namespace posix_time { - //! 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; -+ memset(&timetm, 0, sizeof(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()); |