summaryrefslogtreecommitdiff
path: root/meta-pkgs/boost/patches/patch-ar
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2010-11-26 20:46:59 +0000
committeradam <adam@pkgsrc.org>2010-11-26 20:46:59 +0000
commit6e1fc4a01183af9f440317ffeac35b41792bde95 (patch)
tree329399b4cd596a201e5b04be6f6c9cfabfb34a77 /meta-pkgs/boost/patches/patch-ar
parentb4a558490d59d618f2e8afb5c718cdd8a0b3fd5a (diff)
downloadpkgsrc-6e1fc4a01183af9f440317ffeac35b41792bde95.tar.gz
Changes 1.45.0:
* Fixed a problem on kqueue-based platforms where a deadline_timer may never fire if the io_service is running in a background thread * Fixed a const-correctness issue that prevented valid uses of has_service<> from compiling * Fixed MinGW cross-compilation * Removed dependency on deprecated Boost.System functions * Ensured close()/closesocket() failures are correctly propagated * Added a check for errors returned by InitializeCriticalSectionAndSpinCount * Added support for hardware flow control on QNX * Always use pselect() on HP-UX, if it is available. * Ensured handler arguments are passed as lvalues * Fixed Windows build when thread support is disabled * Fixed a Windows-specific problem where deadline_timer objects with expiry times set more than 5 minutes in the future may never expire * Fixed the resolver backend on BSD platforms so that an empty service name resolves to port number 0, as per the documentation * Fixed read operations so that they do not accept buffer sequences of type const_buffers_1 * Redefined Protocol and id to avoid clashing with Objective-C++ keywords * Fixed a vector reallocation performance issue that can occur when there are many active deadline_timer objects * Fixed the kqueue backend so that it compiles on NetBSD * Fixed the socket io_control() implementation on 64-bit Mac OS X and BSD platforms * Fixed a Windows-specific problem where failures from accept() are incorrectly treated as successes * Deprecated the separate compilation header <boost/asio/impl/src.cpp> in favour of <boost/asio/impl/src.hpp>
Diffstat (limited to 'meta-pkgs/boost/patches/patch-ar')
-rw-r--r--meta-pkgs/boost/patches/patch-ar29
1 files changed, 10 insertions, 19 deletions
diff --git a/meta-pkgs/boost/patches/patch-ar b/meta-pkgs/boost/patches/patch-ar
index dcc8534f6d5..9a93bf1d848 100644
--- a/meta-pkgs/boost/patches/patch-ar
+++ b/meta-pkgs/boost/patches/patch-ar
@@ -1,31 +1,22 @@
-$NetBSD: patch-ar,v 1.1 2010/08/25 22:50:13 tez Exp $
+$NetBSD: patch-ar,v 1.2 2010/11/26 20:47:01 adam Exp $
-Cater to compilers too stupid to interpret a bitwise OR in a template
-argument as a constant. (From https://svn.boost.org/trac/boost/ticket/4146)
-
---- boost/property_tree/detail/xml_parser_read_rapidxml.hpp.orig 2010-08-20 13:41:30.645363600 -0500
-+++ boost/property_tree/detail/xml_parser_read_rapidxml.hpp 2010-08-20 13:46:11.091510100 -0500
-@@ -94,9 +94,12 @@
+--- boost/property_tree/detail/xml_parser_read_rapidxml.hpp.orig 2010-10-15 12:40:04.000000000 +0000
++++ boost/property_tree/detail/xml_parser_read_rapidxml.hpp
+@@ -103,13 +103,13 @@ namespace boost { namespace property_tre
+
try {
// Parse using appropriate flags
- using namespace rapidxml;
- const int f_tws = parse_normalize_whitespace
- | parse_trim_whitespace;
+ const int f_tws = (parse_normalize_whitespace
+ | parse_trim_whitespace);
const int f_c = parse_comment_nodes;
+ // Some compilers don't like the bitwise or in the template arg.
+- const int f_tws_c = parse_normalize_whitespace
+ const int f_tws_c = (parse_normalize_whitespace
-+ | parse_trim_whitespace
-+ | parse_comment_nodes);
+ | parse_trim_whitespace
+- | parse_comment_nodes;
++ | parse_comment_nodes);
xml_document<Ch> doc;
if (flags & no_comments) {
if (flags & trim_whitespace)
-@@ -105,7 +108,7 @@
- doc.BOOST_NESTED_TEMPLATE parse<0>(&v.front());
- } else {
- if (flags & trim_whitespace)
-- doc.BOOST_NESTED_TEMPLATE parse<f_tws | f_c>(&v.front());
-+ doc.BOOST_NESTED_TEMPLATE parse<f_tws_c>(&v.front());
- else
- doc.BOOST_NESTED_TEMPLATE parse<f_c>(&v.front());
- }