summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-06 17:48:08 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-06 17:48:08 (GMT)
commitc2cf7f0e59c7880a9ce979d8a45d97442c705110 (patch)
tree7f86dc63cd8147246c79736e8313c614863a719d /3rdParty/Boost
parentd76ada0ab59634e3333f9eb5a92d0e850f60d7bf (diff)
downloadswift-c2cf7f0e59c7880a9ce979d8a45d97442c705110.zip
swift-c2cf7f0e59c7880a9ce979d8a45d97442c705110.tar.bz2
Added boost compilation fix diff.
In case compilation only works on Linux, this patch should be applied.
Diffstat (limited to '3rdParty/Boost')
-rw-r--r--3rdParty/Boost/1_compilation_fix.diff44
1 files changed, 44 insertions, 0 deletions
diff --git a/3rdParty/Boost/1_compilation_fix.diff b/3rdParty/Boost/1_compilation_fix.diff
new file mode 100644
index 0000000..ad62fe1
--- /dev/null
+++ b/3rdParty/Boost/1_compilation_fix.diff
@@ -0,0 +1,44 @@
+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());