summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Boost/1_fix_date_time_warnings.diff (renamed from 3rdParty/Boost/1_compilation_fix.diff)0
-rw-r--r--3rdParty/Boost/src/boost/date_time/gregorian/conversion.hpp4
-rw-r--r--3rdParty/Boost/src/boost/date_time/posix_time/conversion.hpp4
-rwxr-xr-x3rdParty/Boost/update.sh2
4 files changed, 8 insertions, 2 deletions
diff --git a/3rdParty/Boost/1_compilation_fix.diff b/3rdParty/Boost/1_fix_date_time_warnings.diff
index ad62fe1..ad62fe1 100644
--- a/3rdParty/Boost/1_compilation_fix.diff
+++ b/3rdParty/Boost/1_fix_date_time_warnings.diff
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());
diff --git a/3rdParty/Boost/update.sh b/3rdParty/Boost/update.sh
index d08c971..59c61bd 100755
--- a/3rdParty/Boost/update.sh
+++ b/3rdParty/Boost/update.sh
@@ -38,3 +38,5 @@ for lib in $LIBS; do
rm -rf $TARGET_DIR/libs/$lib/build $TARGET_DIR/libs/$lib/*.doc $TARGET_DIR/libs/$lib/src/*.doc $TARGET_DIR/libs/$lib/src/CMakeLists.txt $TARGET_DIR/libs/$lib/test
done
rm -rf $TARGET_DIR/tools/bcp/*.html $TARGET_DIR/libs/test $TARGET_DIR/doc $TARGET_DIR/boost.png $TARGET_DIR/boost/test $TARGET_DIR/tools/bcp/Jamfile.v2 $TARGET_DIR/tools/bcp/doc $TARGET_DIR/tools/bcp/test $TARGET_DIR/Jamroot
+
+patch -p3 < *.diff