View | Details | Raw Unified | Return to bug 171523
Collapse All | Expand All

(-)./Makefile (-2 / +4 lines)
Lines 6-14 Link Here
6
#
6
#
7
7
8
PORTNAME=	boost-libs
8
PORTNAME=	boost-libs
9
PORTREVISION=	1
9
PORTREVISION=	2
10
10
COMMENT=	Free portable C++ libraries (without Boost.Python)
11
COMMENT=	Free portable C++ libraries (without Boost.Python)
11
USE_BZIP2=	yes
12
12
13
BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
13
BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
14
14
Lines 23-28 Link Here
23
		serialization signals system thread unit_test_framework\
23
		serialization signals system thread unit_test_framework\
24
		wave wserialization
24
		wave wserialization
25
25
26
USE_BZIP2=	yes
27
26
.include <bsd.port.pre.mk>
28
.include <bsd.port.pre.mk>
27
.include "${PORTSDIR}/devel/boost-all/common.mk"
29
.include "${PORTSDIR}/devel/boost-all/common.mk"
28
.include "${PORTSDIR}/devel/boost-all/compiled.mk"
30
.include "${PORTSDIR}/devel/boost-all/compiled.mk"
(-)./files/patch-boost-xpressive-traits-cpp_regex_traits.hpp (+28 lines)
Line 0 Link Here
1
--- boost/xpressive/traits/cpp_regex_traits.hpp.orig
2
+++ boost/xpressive/traits/cpp_regex_traits.hpp
3
@@ -24,6 +24,7 @@
4
 #include <boost/assert.hpp>
5
 #include <boost/integer.hpp>
6
 #include <boost/mpl/assert.hpp>
7
+#include <boost/static_assert.hpp>
8
 #include <boost/detail/workaround.hpp>
9
 #include <boost/type_traits/is_same.hpp>
10
 #include <boost/xpressive/detail/detail_fwd.hpp>
11
@@ -89,7 +90,7 @@ namespace detail
12
     template<umaskex_t In, umaskex_t Out = highest_bit, bool Done = (0 == (Out & In))>
13
     struct unused_mask
14
     {
15
-        BOOST_MPL_ASSERT_RELATION(1, !=, Out);
16
+        BOOST_STATIC_ASSERT(1 != Out);
17
         BOOST_STATIC_CONSTANT(umaskex_t, value = (unused_mask<In, (Out >> 1)>::value));
18
     };
19
 
20
@@ -121,6 +122,8 @@ namespace detail
21
     umaskex_t const std_ctype_reserved = 0x8000;
22
     #elif defined(_CPPLIB_VER) && defined(BOOST_WINDOWS)
23
     umaskex_t const std_ctype_reserved = 0x8200;
24
+    #elif defined(_LIBCPP_VERSION)
25
+    umaskex_t const std_ctype_reserved = 0x8000;
26
     #else
27
     umaskex_t const std_ctype_reserved = 0;
28
     #endif
(-)./files/patch-libs-signals-src-named_slot_map.cpp (+20 lines)
Line 0 Link Here
1
--- libs/signals/src/named_slot_map.cpp.orig
2
+++ libs/signals/src/named_slot_map.cpp
3
@@ -102,7 +102,7 @@ void named_slot_map::disconnect(const stored_group& name)
4
       i->first.disconnect();
5
       i = next;
6
     }
7
-    groups.erase(group);
8
+    groups.erase((const_group_iterator) group);
9
   }
10
 }
11
 
12
@@ -125,7 +125,7 @@ void named_slot_map::remove_disconnected_slots()
13
     }
14
 
15
     // Clear out empty groups
16
-    if (empty(g)) groups.erase(g++);
17
+    if (empty(g)) groups.erase((const_group_iterator) g++);
18
     else ++g;
19
   }
20
 }
(-)./files/patch-libs-xpressive-doc-acknowledgements.qbk (+12 lines)
Line 0 Link Here
1
--- libs/xpressive/doc/acknowledgements.qbk.orig
2
+++ libs/xpressive/doc/acknowledgements.qbk
3
@@ -29,6 +29,9 @@ Xpressive's ternary search trie implementation is David's, as is the number
4
 parser example in [^libs/xpressive/example/numbers.cpp] and the documentation
5
 for symbol tables and attributes.
6
 
7
+Thanks to John Fletcher for helping track down a runtime assertion when using
8
+xpressive with Howard Hinnant's most excellent libc++.
9
+
10
 Finally, I would like to thank [@http://boost.org/people/thomas_witt.html Thomas Witt]
11
 for acting as xpressive's review manager.
12
 

Return to bug 171523