Skip to content

Commit 3be9f2e

Browse files
hobuhobu
committed
increment boost to 1.54, add asio, string_ref, and regex
1 parent 971024b commit 3be9f2e

File tree

1,632 files changed

+251085
-8832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,632 files changed

+251085
-8832
lines changed

‎boost/Jamroot

+56-59
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# Copyright Douglas Gregor 2005.
55
#
66
# Distributed under the Boost Software License, Version 1.0.
7-
# (See accompanying file LICENSE_1_0.txt or copy at
8-
# http://www.boost.org/LICENSE_1_0.txt)
7+
# (See accompanying file LICENSE_1_0.txt or copy at
8+
# http://www.boost.org/LICENSE_1_0.txt)
99

1010
# Usage:
1111
#
12-
# bjam [options] [properties] [install|stage]
12+
# b2 [options] [properties] [install|stage]
1313
#
1414
# Builds and installs Boost.
1515
#
@@ -31,93 +31,91 @@
3131
# --includedir=<HDRDIR> Install header files here.
3232
# Default; <PREFIX>/include
3333
#
34-
# stage Build and install only compiled library files
35-
# ===== to the stage directory.
34+
# stage Build and install only compiled library files to the
35+
# ===== stage directory.
3636
#
3737
# --stagedir=<STAGEDIR> Install library files here
3838
# Default; ./stage
3939
#
4040
# Other Options:
4141
#
42-
# --build-type=<type> Build the specified pre-defined set of variations
43-
# of the libraries. Note, that which variants get
44-
# built depends on what each library supports.
42+
# --build-type=<type> Build the specified pre-defined set of variations of
43+
# the libraries. Note, that which variants get built
44+
# depends on what each library supports.
4545
#
46-
# minimal (default) - Builds a minimal set of
47-
# variants. On Windows, these are static
46+
# -- minimal -- (default) Builds a minimal set of
47+
# variants. On Windows, these are static
4848
# multithreaded libraries in debug and release
49-
# modes, using shared runtime. On Linux, these
50-
# are static and shared multithreaded libraries
51-
# in release mode.
49+
# modes, using shared runtime. On Linux, these are
50+
# static and shared multithreaded libraries in
51+
# release mode.
5252
#
53-
# complete - Build all possible variations.
53+
# -- complete -- Build all possible variations.
5454
#
55-
# --build-dir=DIR Build in this location instead of building
56-
# within the distribution tree. Recommended!
55+
# --build-dir=DIR Build in this location instead of building within
56+
# the distribution tree. Recommended!
5757
#
58-
# --show-libraries Displays the list of Boost libraries that require
59-
# build and installation steps, then exit.
58+
# --show-libraries Display the list of Boost libraries that require
59+
# build and installation steps, and then exit.
6060
#
61-
# --layout=<layout> Determines whether to choose library names
62-
# and header locations such that multiple
63-
# versions of Boost or multiple compilers can
64-
# be used on the same system.
61+
# --layout=<layout> Determine whether to choose library names and header
62+
# locations such that multiple versions of Boost or
63+
# multiple compilers can be used on the same system.
6564
#
66-
# versioned - Names of boost binaries
67-
# include the Boost version number, name and
68-
# version of the compiler and encoded build
69-
# properties. Boost headers are installed in a
70-
# subdirectory of <HDRDIR> whose name contains
71-
# the Boost version number.
65+
# -- versioned -- Names of boost binaries include
66+
# the Boost version number, name and version of
67+
# the compiler and encoded build properties. Boost
68+
# headers are installed in a subdirectory of
69+
# <HDRDIR> whose name contains the Boost version
70+
# number.
7271
#
73-
# tagged -- Names of boost binaries include the
72+
# -- tagged -- Names of boost binaries include the
7473
# encoded build properties such as variant and
7574
# threading, but do not including compiler name
7675
# and version, or Boost version. This option is
7776
# useful if you build several variants of Boost,
7877
# using the same compiler.
7978
#
80-
# system - Binaries names do not include the
79+
# -- system -- Binaries names do not include the
8180
# Boost version number or the name and version
82-
# number of the compiler. Boost headers are
83-
# installed directly into <HDRDIR>. This option
84-
# is intended for system integrators who are
85-
# building distribution packages.
81+
# number of the compiler. Boost headers are
82+
# installed directly into <HDRDIR>. This option is
83+
# intended for system integrators building
84+
# distribution packages.
8685
#
8786
# The default value is 'versioned' on Windows, and
8887
# 'system' on Unix.
8988
#
90-
# --buildid=ID Adds the specified ID to the name of built
91-
# libraries. The default is to not add anything.
92-
#
93-
# --python-buildid=ID Adds the specified ID to the name of built
94-
# libraries that depend on Python. The default
95-
# is to not add anything. This ID is added in
96-
# addition to --buildid.
89+
# --buildid=ID Add the specified ID to the name of built libraries.
90+
# The default is to not add anything.
9791
#
92+
# --python-buildid=ID Add the specified ID to the name of built libraries
93+
# that depend on Python. The default is to not add
94+
# anything. This ID is added in addition to --buildid.
9895
#
9996
# --help This message.
10097
#
101-
# --with-<library> Build and install the specified <library>
102-
# If this option is used, only libraries
103-
# specified using this option will be built.
98+
# --with-<library> Build and install the specified <library>. If this
99+
# option is used, only libraries specified using this
100+
# option will be built.
104101
#
105102
# --without-<library> Do not build, stage, or install the specified
106103
# <library>. By default, all libraries are built.
107104
#
108105
# Properties:
109106
#
110-
# toolset=toolset Indicates the toolset to build with.
107+
# toolset=toolset Indicate the toolset to build with.
111108
#
112109
# variant=debug|release Select the build variant
113110
#
114111
# link=static|shared Whether to build static or shared libraries
115112
#
116113
# threading=single|multi Whether to build single or multithreaded binaries
117-
#
118-
# runtime-link=static|shared
119-
# Whether to link to static or shared C and C++ runtime.
120-
#
114+
#
115+
# runtime-link=static|shared
116+
# Whether to link to static or shared C and C++
117+
# runtime.
118+
#
121119

122120
# TODO:
123121
# - handle boost version
@@ -132,7 +130,7 @@ import set ;
132130
import path ;
133131

134132
path-constant BOOST_ROOT : . ;
135-
constant BOOST_VERSION : 1.53.0 ;
133+
constant BOOST_VERSION : 1.54.0 ;
136134
constant BOOST_JAMROOT_MODULE : $(__name__) ;
137135

138136
boostcpp.set-version $(BOOST_VERSION) ;
@@ -165,12 +163,12 @@ rule tag ( name : type ? : property-set )
165163
{
166164
return [ boostcpp.tag $(name) : $(type) : $(property-set) ] ;
167165
}
168-
166+
169167
rule handle-static-runtime ( properties * )
170168
{
171-
# Using static runtime with shared libraries is impossible on Linux,
172-
# and dangerous on Windows. Therefore, we disallow it. This might
173-
# be drastic, but it was disabled for a while with nobody complaining.
169+
# Using static runtime with shared libraries is impossible on Linux, and
170+
# dangerous on Windows. Therefore, we disallow it. This might be drastic,
171+
# but it was disabled for a while without anybody complaining.
174172

175173
# For CW, static runtime is needed so that std::locale works.
176174
if <link>shared in $(properties) && <runtime-link>static in $(properties) &&
@@ -184,8 +182,7 @@ rule handle-static-runtime ( properties * )
184182
}
185183

186184
all-libraries = [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ]
187-
[ glob libs/*/build/Jamfile ] ]
188-
;
185+
[ glob libs/*/build/Jamfile ] ] ;
189186

190187
all-libraries = [ sequence.unique $(all-libraries) ] ;
191188
# The function_types library has a Jamfile, but it's used for maintenance
@@ -251,10 +248,10 @@ rule boost-install ( libraries * )
251248
}
252249

253250
headers =
254-
# The .SUNWCCh files are present in tr1 include directory and have to be installed,
255-
# see http://lists.boost.org/Archives/boost/2007/05/121430.php
251+
# The .SUNWCCh files are present in tr1 include directory and have to be
252+
# installed (see http://lists.boost.org/Archives/boost/2007/05/121430.php).
256253
[ path.glob-tree $(BOOST_ROOT)/boost : *.hpp *.ipp *.h *.inc *.SUNWCCh : CVS .svn ]
257-
[ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS .svn ]
254+
[ path.glob-tree $(BOOST_ROOT)/boost/compatibility/cpp_c_headers : c* : CVS .svn ]
258255
[ path.glob boost/tr1/tr1 : * : bcc32 sun CVS .svn ]
259256
;
260257

‎boost/boost/accumulators/accumulators_fwd.hpp

+12-2
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,18 @@ namespace detail
185185

186186
inline void ignore_variable(void const *) {}
187187

188-
#define BOOST_ACCUMULATORS_IGNORE_GLOBAL(X)\
189-
namespace detail { inline void BOOST_PP_CAT(ignore_, X)() { pdalboost::accumulators::detail::ignore_variable(&X); } }
188+
#define BOOST_ACCUMULATORS_IGNORE_GLOBAL(X) \
189+
namespace detail \
190+
{ \
191+
struct BOOST_PP_CAT(ignore_, X) \
192+
{ \
193+
void ignore() \
194+
{ \
195+
pdalboost::accumulators::detail::ignore_variable(&X); \
196+
} \
197+
}; \
198+
} \
199+
/**/
190200
}
191201

192202
}} // namespace pdalboost::accumulators

‎boost/boost/accumulators/framework/accumulators/droppable_accumulator.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namesp
215215
template<typename Args>
216216
void on_drop(Args const &args)
217217
{
218-
// cache the result at the point this calcuation was dropped
218+
// cache the result at the point this calculation was dropped
219219
BOOST_ASSERT(!this->has_result());
220220
this->set(this->Accumulator::result(args));
221221
}

‎boost/boost/accumulators/framework/parameters/accumulator.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_ACCUMULATOR_HPP_EAN_31_10_2005
1010

1111
#include <boost/parameter/keyword.hpp>
12+
#include <boost/accumulators/accumulators_fwd.hpp>
1213

1314
namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namespace accumulators
1415
{
1516

1617
BOOST_PARAMETER_KEYWORD(tag, accumulator)
18+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(accumulator)
1719

1820
}} // namespace pdalboost::accumulators
1921

‎boost/boost/accumulators/framework/parameters/sample.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_SAMPLE_HPP_EAN_31_10_2005
1010

1111
#include <boost/parameter/keyword.hpp>
12+
#include <boost/accumulators/accumulators_fwd.hpp>
1213

1314
namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namespace accumulators
1415
{
1516

1617
BOOST_PARAMETER_KEYWORD(tag, sample)
18+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(sample)
1719

1820
}} // namespace pdalboost::accumulators
1921

‎boost/boost/accumulators/framework/parameters/weight.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_WEIGHT_HPP_EAN_31_10_2005
1010

1111
#include <boost/parameter/keyword.hpp>
12+
#include <boost/accumulators/accumulators_fwd.hpp>
1213

1314
namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namespace accumulators
1415
{
1516

1617
// The weight of a single sample
1718
BOOST_PARAMETER_KEYWORD(tag, weight)
19+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(weight)
1820

1921
}} // namespace pdalboost::accumulators
2022

‎boost/boost/accumulators/framework/parameters/weights.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
#define BOOST_ACCUMULATORS_FRAMEWORK_PARAMETERS_WEIGHTS_HPP_EAN_28_10_2005
1010

1111
#include <boost/parameter/keyword.hpp>
12+
#include <boost/accumulators/accumulators_fwd.hpp>
1213

1314
namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namespace accumulators
1415
{
1516

1617
// The weight accumulator
1718
BOOST_PARAMETER_KEYWORD(tag, weights)
19+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(weights)
1820

1921
}} // namespace pdalboost::accumulators
2022

‎boost/boost/accumulators/numeric/functional.hpp

+10
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <boost/type_traits/is_floating_point.hpp>
2121
#include <boost/utility/enable_if.hpp>
2222
#include <boost/typeof/typeof.hpp>
23+
#include <boost/accumulators/accumulators_fwd.hpp>
2324
#include <boost/accumulators/numeric/functional_fwd.hpp>
2425
#include <boost/accumulators/numeric/detail/function1.hpp>
2526
#include <boost/accumulators/numeric/detail/function2.hpp>
@@ -166,6 +167,7 @@ namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namesp
166167
{ \
167168
op::Name const &Name = pdalboost::detail::pod_singleton<op::Name>::instance; \
168169
} \
170+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(Name) \
169171
/**/
170172

171173
/// INTERNAL ONLY
@@ -416,6 +418,14 @@ namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namesp
416418
op::as_max const &as_max = pdalboost::detail::pod_singleton<op::as_max>::instance;
417419
op::as_zero const &as_zero = pdalboost::detail::pod_singleton<op::as_zero>::instance;
418420
op::as_one const &as_one = pdalboost::detail::pod_singleton<op::as_one>::instance;
421+
422+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(min_assign)
423+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(max_assign)
424+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(average)
425+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_min)
426+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_max)
427+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_zero)
428+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_one)
419429
}
420430

421431
///////////////////////////////////////////////////////////////////////////////

‎boost/boost/accumulators/statistics/density.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <boost/range.hpp>
1616
#include <boost/parameter/keyword.hpp>
1717
#include <boost/mpl/placeholders.hpp>
18+
#include <boost/accumulators/accumulators_fwd.hpp>
1819
#include <boost/accumulators/framework/accumulator_base.hpp>
1920
#include <boost/accumulators/framework/extractor.hpp>
2021
#include <boost/accumulators/numeric/functional.hpp>
@@ -34,6 +35,9 @@ namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost { namesp
3435
BOOST_PARAMETER_NESTED_KEYWORD(tag, density_cache_size, cache_size)
3536
BOOST_PARAMETER_NESTED_KEYWORD(tag, density_num_bins, num_bins)
3637

38+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(density_cache_size)
39+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(density_num_bins)
40+
3741
namespace impl
3842
{
3943
///////////////////////////////////////////////////////////////////////////////

‎boost/boost/algorithm/string/find_iterator.hpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ namespace pdalboost {} namespace boost = pdalboost; namespace pdalboost {
134134
{
135135
if(m_Match.begin() == m_Match.end())
136136
m_Match=this->do_find(m_Match.end(),m_End);
137-
else
138-
m_Match=this->do_find(m_Match.begin()+1,m_End);
137+
else {
138+
input_iterator_type last = m_Match.begin();
139+
m_Match=this->do_find(++last,m_End);
140+
}
139141
}
140142

141143
// comparison

0 commit comments

Comments
 (0)