summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-12-23 13:16:26 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-12-23 14:43:26 (GMT)
commit491ddd570a752cf9bda85933bed0c6942e39b1f9 (patch)
tree10c25c1be8cc08d0497df1dccd56a10fbb30beee /3rdParty/Boost/01_fix_return_type_warning.diff
parentda7d7a0ca71b80281aa9ff2526290b61ccb0cc60 (diff)
downloadswift-491ddd570a752cf9bda85933bed0c6942e39b1f9.zip
swift-491ddd570a752cf9bda85933bed0c6942e39b1f9.tar.bz2
Update Boost to 1.52.0.
Change-Id: I1e56bea2600bf2ed9c5b3aba8c4f9d2a0f350e77
Diffstat (limited to '3rdParty/Boost/01_fix_return_type_warning.diff')
-rw-r--r--3rdParty/Boost/01_fix_return_type_warning.diff13
1 files changed, 13 insertions, 0 deletions
diff --git a/3rdParty/Boost/01_fix_return_type_warning.diff b/3rdParty/Boost/01_fix_return_type_warning.diff
new file mode 100644
index 0000000..3f1fe83
--- /dev/null
+++ b/3rdParty/Boost/01_fix_return_type_warning.diff
@@ -0,0 +1,13 @@
+diff --git a/3rdParty/Boost/src/libs/thread/src/pthread/thread.cpp b/3rdParty/Boost/src/libs/thread/src/pthread/thread.cpp
+index 4321a26..c83eac1 100644
+--- a/3rdParty/Boost/src/libs/thread/src/pthread/thread.cpp
++++ b/3rdParty/Boost/src/libs/thread/src/pthread/thread.cpp
+@@ -27,6 +27,8 @@
+
+ #include "./timeconv.inl"
+
++#pragma GCC diagnostic ignored "-Wreturn-type"
++
+ namespace boost
+ {
+ namespace detail