Skip to content

Commit d2016e7

Browse files
satoon101satoon101
committed
Updated src/thirdparty/boost/boost/ directory. Removed 2 old files from src/thirdparty/boost/lib/
1 parent 0b926be commit d2016e7

4,373 files changed

Lines changed: 278331 additions & 120213 deletions

File tree

Some content is hidden

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

‎src/thirdparty/boost/boost/accumulators/accumulators_fwd.hpp‎

Lines changed: 12 additions & 2 deletions
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)() { boost::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+
boost::accumulators::detail::ignore_variable(&X); \
196+
} \
197+
}; \
198+
} \
199+
/**/
190200
}
191201

192202
}} // namespace boost::accumulators

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ namespace boost { namespace accumulators
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
}

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

Lines changed: 2 additions & 0 deletions
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 boost { namespace accumulators
1415
{
1516

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

1820
}} // namespace boost::accumulators
1921

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

Lines changed: 2 additions & 0 deletions
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 boost { namespace accumulators
1415
{
1516

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

1820
}} // namespace boost::accumulators
1921

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

Lines changed: 2 additions & 0 deletions
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 boost { 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 boost::accumulators
2022

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

Lines changed: 2 additions & 0 deletions
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 boost { namespace accumulators
1415
{
1516

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

1921
}} // namespace boost::accumulators
2022

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

Lines changed: 29 additions & 5 deletions
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 boost { namespace numeric
166167
{ \
167168
op::Name const &Name = boost::detail::pod_singleton<op::Name>::instance; \
168169
} \
170+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(Name) \
169171
/**/
170172

171173
/// INTERNAL ONLY
@@ -243,14 +245,14 @@ namespace boost { namespace numeric
243245
};
244246

245247
template<typename Left, typename Right, typename EnableIf>
246-
struct average_base
248+
struct fdiv_base
247249
: functional::divides<Left, Right>
248250
{};
249251

250252
// partial specialization that promotes the arguments to double for
251253
// integral division.
252254
template<typename Left, typename Right>
253-
struct average_base<Left, Right, typename enable_if<are_integral<Left, Right> >::type>
255+
struct fdiv_base<Left, Right, typename enable_if<are_integral<Left, Right> >::type>
254256
: functional::divides<double const, double const>
255257
{};
256258

@@ -345,9 +347,16 @@ namespace boost { namespace numeric
345347
: max_assign_base<Left, Right, void>
346348
{};
347349

350+
template<typename Left, typename Right, typename LeftTag, typename RightTag>
351+
struct fdiv
352+
: fdiv_base<Left, Right, void>
353+
{};
354+
355+
/// INTERNAL ONLY
356+
/// For back-compat only. Use fdiv.
348357
template<typename Left, typename Right, typename LeftTag, typename RightTag>
349358
struct average
350-
: average_base<Left, Right, void>
359+
: fdiv<Left, Right, LeftTag, RightTag>
351360
{};
352361

353362
template<typename Arg, typename Tag>
@@ -386,8 +395,13 @@ namespace boost { namespace numeric
386395
: boost::detail::function2<functional::max_assign<_1, _2, functional::tag<_1>, functional::tag<_2> > >
387396
{};
388397

398+
struct fdiv
399+
: boost::detail::function2<functional::fdiv<_1, _2, functional::tag<_1>, functional::tag<_2> > >
400+
{};
401+
402+
/// INTERNAL ONLY
389403
struct average
390-
: boost::detail::function2<functional::average<_1, _2, functional::tag<_1>, functional::tag<_2> > >
404+
: boost::detail::function2<functional::fdiv<_1, _2, functional::tag<_1>, functional::tag<_2> > >
391405
{};
392406

393407
struct as_min
@@ -411,11 +425,21 @@ namespace boost { namespace numeric
411425
{
412426
op::min_assign const &min_assign = boost::detail::pod_singleton<op::min_assign>::instance;
413427
op::max_assign const &max_assign = boost::detail::pod_singleton<op::max_assign>::instance;
414-
op::average const &average = boost::detail::pod_singleton<op::average>::instance;
428+
op::fdiv const &fdiv = boost::detail::pod_singleton<op::fdiv>::instance;
429+
op::fdiv const &average = boost::detail::pod_singleton<op::fdiv>::instance; ///< INTERNAL ONLY
415430
op::as_min const &as_min = boost::detail::pod_singleton<op::as_min>::instance;
416431
op::as_max const &as_max = boost::detail::pod_singleton<op::as_max>::instance;
417432
op::as_zero const &as_zero = boost::detail::pod_singleton<op::as_zero>::instance;
418433
op::as_one const &as_one = boost::detail::pod_singleton<op::as_one>::instance;
434+
435+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(min_assign)
436+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(max_assign)
437+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(fdiv)
438+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(average)
439+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_min)
440+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_max)
441+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_zero)
442+
BOOST_ACCUMULATORS_IGNORE_GLOBAL(as_one)
419443
}
420444

421445
///////////////////////////////////////////////////////////////////////////////

‎src/thirdparty/boost/boost/accumulators/numeric/functional/valarray.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ namespace boost { namespace numeric
234234
}
235235
};
236236

237-
// partial specialization of numeric::average<> for std::valarray.
237+
// partial specialization of numeric::fdiv<> for std::valarray.
238238
template<typename Left, typename Right, typename RightTag>
239-
struct average<Left, Right, std_valarray_tag, RightTag>
239+
struct fdiv<Left, Right, std_valarray_tag, RightTag>
240240
: mpl::if_<
241241
are_integral<typename Left::value_type, Right>
242242
, divides<Left, double const>

‎src/thirdparty/boost/boost/accumulators/numeric/functional/vector.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ namespace boost { namespace numeric
231231

232232
// partial specialization for std::vector.
233233
template<typename Left, typename Right>
234-
struct average<Left, Right, std_vector_tag, void>
234+
struct fdiv<Left, Right, std_vector_tag, void>
235235
: mpl::if_<
236236
are_integral<typename Left::value_type, Right>
237237
, divides<Left, double const>

‎src/thirdparty/boost/boost/accumulators/numeric/functional_fwd.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace boost { namespace numeric
141141
template<typename Left, typename Right, typename EnableIf = void>
142142
struct max_assign_base;
143143
template<typename Left, typename Right, typename EnableIf = void>
144-
struct average_base;
144+
struct fdiv_base;
145145
template<typename Arg, typename EnableIf = void>
146146
struct as_min_base;
147147
template<typename Arg, typename EnableIf = void>
@@ -158,7 +158,7 @@ namespace boost { namespace numeric
158158
template<typename Left, typename Right, typename LeftTag = typename tag<Left>::type, typename RightTag = typename tag<Right>::type>
159159
struct max_assign;
160160
template<typename Left, typename Right, typename LeftTag = typename tag<Left>::type, typename RightTag = typename tag<Right>::type>
161-
struct average;
161+
struct fdiv;
162162
template<typename Arg, typename Tag = typename tag<Arg>::type>
163163
struct as_min;
164164
template<typename Arg, typename Tag = typename tag<Arg>::type>
@@ -175,7 +175,7 @@ namespace boost { namespace numeric
175175
struct promote;
176176
struct min_assign;
177177
struct max_assign;
178-
struct average;
178+
struct fdiv;
179179
struct as_min;
180180
struct as_max;
181181
struct as_zero;
@@ -186,7 +186,7 @@ namespace boost { namespace numeric
186186
{
187187
extern op::min_assign const &min_assign;
188188
extern op::max_assign const &max_assign;
189-
extern op::average const &average;
189+
extern op::fdiv const &fdiv;
190190
extern op::as_min const &as_min;
191191
extern op::as_max const &as_max;
192192
extern op::as_zero const &as_zero;

0 commit comments

Comments
 (0)