From c070795c4358e3731bc94ea606b0ebc3a4dbe1f3 Mon Sep 17 00:00:00 2001 From: Thomas Sailer Date: May 04 2015 10:52:35 +0000 Subject: update mingw patch --- diff --git a/boost-1.54.0-locale-unused_typedef.patch b/boost-1.54.0-locale-unused_typedef.patch new file mode 100644 index 0000000..b7c9128 --- /dev/null +++ b/boost-1.54.0-locale-unused_typedef.patch @@ -0,0 +1,11 @@ +diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp +--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 ++++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 +@@ -27,7 +27,6 @@ namespace boundary { + int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) + { + typedef LeftIterator left_iterator; +- typedef RightIterator right_iterator; + typedef typename std::iterator_traits::value_type char_type; + typedef std::char_traits traits; + while(l_begin!=l_end && r_begin!=r_end) { diff --git a/boost-1.54.0-pool-max_chunks_shadow.patch b/boost-1.54.0-pool-max_chunks_shadow.patch new file mode 100644 index 0000000..1a85fce --- /dev/null +++ b/boost-1.54.0-pool-max_chunks_shadow.patch @@ -0,0 +1,14 @@ +diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp +--- ./boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 ++++ ./boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 +@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ + { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. + size_type partition_size = alloc_size(); + size_type POD_size = math::static_lcm::value + sizeof(size_type); +- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); +- +- return max_chunks; ++ return (std::numeric_limits::max() - POD_size) / alloc_size(); + } + + static void * & nextof(void * const ptr) diff --git a/boost-mingw.patch b/boost-mingw.patch index b8a98dd..0058637 100644 --- a/boost-mingw.patch +++ b/boost-mingw.patch @@ -12,19 +12,21 @@ --- libs/context/build/Jamfile.v2.orig 2013-03-03 13:39:59.684868916 +0100 +++ libs/context/build/Jamfile.v2 2013-03-03 15:09:09.893232829 +0100 -@@ -26,8 +26,9 @@ +@@ -27,9 +27,10 @@ local rule default_binary_format ( ) { local tmp = elf ; - if [ os.name ] = "MACOSX" { tmp = mach-o ; } - if [ os.name ] = "NT" { tmp = pe ; } +- if [ os.name ] = "AIX" { tmp = xcoff ; } +# if [ os.name ] = "MACOSX" { tmp = mach-o ; } +# if [ os.name ] = "NT" { tmp = pe ; } ++# if [ os.name ] = "AIX" { tmp = xcoff ; } + tmp = pe ; return $(tmp) ; } -@@ -43,9 +44,10 @@ +@@ -46,9 +47,10 @@ local rule default_abi ( ) { local tmp = sysv ; @@ -38,7 +40,7 @@ return $(tmp) ; } -@@ -282,6 +284,17 @@ +@@ -581,6 +583,17 @@ ; alias asm_context_sources @@ -56,7 +58,7 @@ : asm/make_i386_ms_pe_masm.asm asm/jump_i386_ms_pe_masm.asm dummy.cpp -@@ -379,6 +392,17 @@ +@@ -715,6 +728,17 @@ ; alias asm_context_sources