forked from msys2/MINGW-packages
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
=== Rebuild with GCC-5.1.0. Part IV ===
- Loading branch information
Showing
46 changed files
with
773 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<left_iterator>::value_type char_type; | ||
| typedef std::char_traits<char_type> traits; | ||
| while(l_begin!=l_end && r_begin!=r_end) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); | ||
| - size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); | ||
| - | ||
| - return max_chunks; | ||
| + return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); | ||
| } | ||
|
|
||
| static void * & nextof(void * const ptr) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp | ||
| --- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 | ||
| +++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 | ||
| @@ -147,8 +147,8 @@ namespace detail | ||
| template <class T> | ||
| inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const | ||
| { | ||
| - typedef converter::registered<argument_type> r; | ||
| # if BOOST_WORKAROUND(__GNUC__, < 3) | ||
| + typedef converter::registered<argument_type> r; | ||
| // suppresses an ICE, somehow | ||
| (void)r::converters; | ||
| # endif | ||
|
|
||
| Diff finished. Tue Jul 23 16:19:05 2013 |
98 changes: 98 additions & 0 deletions
98
mingw-w64-boost/boost-1.55.0-python-test-PyImport_AppendInittab.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp | ||
| --- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200 | ||
| +++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100 | ||
| @@ -56,6 +56,20 @@ void eval_test() | ||
| BOOST_TEST(value == "ABCDEFG"); | ||
| } | ||
|
|
||
| +struct PyCtx | ||
| +{ | ||
| + PyCtx() { | ||
| + Py_Initialize(); | ||
| + } | ||
| + | ||
| + ~PyCtx() { | ||
| + // N.B. certain problems may arise when Py_Finalize is called when | ||
| + // using Boost.Python. However in this test suite it all seems to | ||
| + // work fine. | ||
| + Py_Finalize(); | ||
| + } | ||
| +}; | ||
| + | ||
| void exec_test() | ||
| { | ||
| // Register the module with the interpreter | ||
| @@ -68,6 +82,8 @@ void exec_test() | ||
| ) == -1) | ||
| throw std::runtime_error("Failed to add embedded_hello to the interpreter's " | ||
| "builtin modules"); | ||
| + | ||
| + PyCtx ctx; | ||
| // Retrieve the main module | ||
| python::object main = python::import("__main__"); | ||
|
|
||
| @@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal | ||
| } | ||
| } | ||
|
|
||
| +template <class Cb> | ||
| +bool | ||
| +run_and_handle_exception(Cb cb, bool pyerr_expected = false) | ||
| +{ | ||
| + PyCtx ctx; | ||
| + if (python::handle_exception(cb)) { | ||
| + check_pyerr(pyerr_expected); | ||
| + return true; | ||
| + } else { | ||
| + return false; | ||
| + } | ||
| +} | ||
| + | ||
| int main(int argc, char **argv) | ||
| { | ||
| BOOST_TEST(argc == 2 || argc == 3); | ||
| std::string script = argv[1]; | ||
| - // Initialize the interpreter | ||
| - Py_Initialize(); | ||
|
|
||
| - if (python::handle_exception(eval_test)) { | ||
| - check_pyerr(); | ||
| - } | ||
| - else if(python::handle_exception(exec_test)) { | ||
| - check_pyerr(); | ||
| - } | ||
| - else if (python::handle_exception(boost::bind(exec_file_test, script))) { | ||
| + // N.B. exec_test mustn't be called through run_and_handle_exception | ||
| + // as it needs to handles the python context by itself. | ||
| + if (run_and_handle_exception(eval_test) | ||
| + || python::handle_exception(exec_test)) | ||
| check_pyerr(); | ||
| - } | ||
| - | ||
| - if (python::handle_exception(exec_test_error)) | ||
| - { | ||
| - check_pyerr(/*pyerr_expected*/ true); | ||
| - } | ||
| else | ||
| - { | ||
| + run_and_handle_exception(boost::bind(exec_file_test, script)); | ||
| + | ||
| + if (!run_and_handle_exception(exec_test_error, true)) | ||
| BOOST_ERROR("Python exception expected, but not seen."); | ||
| - } | ||
|
|
||
| if (argc > 2) { | ||
| + PyCtx ctx; | ||
| // The main purpose is to test compilation. Since this test generates | ||
| // a file and I (rwgk) am uncertain about the side-effects, run it only | ||
| // if explicitly requested. | ||
| exercise_embedding_html(); | ||
| } | ||
|
|
||
| - // Boost.Python doesn't support Py_Finalize yet. | ||
| - // Py_Finalize(); | ||
| return boost::report_errors(); | ||
| } | ||
|
|
||
|
|
||
| Diff finished. Fri Jan 9 21:31:13 2015 |
Oops, something went wrong.