Skip to content

Commit 3b9d7ae

Browse files
committed
updated included boost version to 1.86, to try to fix c++17
in C++17 we do not have unary_function anymore, but old version was using it and this produced fails in the CI
1 parent 414027e commit 3b9d7ae

File tree

7,406 files changed

+739626
-250736
lines changed

Some content is hidden

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

7,406 files changed

+739626
-250736
lines changed

boost/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ add_library(boost_program_options STATIC ${SRC})
1111
set_property(TARGET boost_program_options PROPERTY POSITION_INDEPENDENT_CODE ON)
1212
#target_link_library(boost_program_options boost)
1313
set_target_properties(boost_program_options PROPERTIES
14-
VERSION 1.73.0
14+
VERSION 1.86.0
1515
)
1616
target_include_directories(boost_program_options PUBLIC headers/ )
17+
target_compile_features(boost_program_options PUBLIC cxx_std_11)

boost/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# INFO
2-
this is taken from boost 1.73.0
2+
this is taken from boost 1.86.0

boost/headers/boost/accumulators/framework/accumulator_set.hpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,19 @@ namespace detail
5454
{
5555
}
5656

57+
accumulator_visitor(accumulator_visitor const &other)
58+
: args(other.args)
59+
{
60+
}
61+
5762
template<typename Accumulator>
5863
void operator ()(Accumulator &accumulator) const
5964
{
6065
accumulator(this->args);
6166
}
6267

6368
private:
64-
accumulator_visitor &operator =(accumulator_visitor const &);
69+
BOOST_DELETED_FUNCTION(accumulator_visitor &operator =(accumulator_visitor const &))
6570
Args const &args;
6671
};
6772

boost/headers/boost/accumulators/framework/accumulators/droppable_accumulator.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ namespace boost { namespace accumulators
3434
{
3535
}
3636

37+
add_ref_visitor(add_ref_visitor const &other)
38+
: args_(other.args_)
39+
{
40+
}
41+
3742
template<typename Accumulator>
3843
void operator ()(Accumulator &acc) const
3944
{
@@ -49,7 +54,7 @@ namespace boost { namespace accumulators
4954
}
5055

5156
private:
52-
add_ref_visitor &operator =(add_ref_visitor const &);
57+
BOOST_DELETED_FUNCTION(add_ref_visitor &operator =(add_ref_visitor const &))
5358
Args const &args_;
5459
};
5560

@@ -87,7 +92,7 @@ namespace boost { namespace accumulators
8792
}
8893

8994
private:
90-
drop_visitor &operator =(drop_visitor const &);
95+
BOOST_DELETED_FUNCTION(drop_visitor &operator =(drop_visitor const &))
9196
Args const &args_;
9297
};
9398

@@ -227,7 +232,7 @@ namespace boost { namespace accumulators
227232
}
228233

229234
private:
230-
with_cached_result &operator =(with_cached_result const &);
235+
BOOST_DELETED_FUNCTION(with_cached_result &operator =(with_cached_result const &))
231236

232237
void set(result_type const &r)
233238
{

boost/headers/boost/accumulators/framework/depends_on.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@ namespace boost { namespace accumulators
321321
{
322322
}
323323

324+
accumulator_wrapper& operator=(accumulator_wrapper const &that)
325+
{
326+
*static_cast<Accumulator *>(this) = *static_cast<Accumulator const *>(&that);
327+
return *this;
328+
}
329+
324330
template<typename Args>
325331
accumulator_wrapper(Args const &args)
326332
: Accumulator(args)

boost/headers/boost/accumulators/statistics/count.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ namespace impl
4545

4646
// make this accumulator serializeable
4747
template<class Archive>
48-
void serialize(Archive & ar, const unsigned int file_version)
49-
{
48+
void serialize(Archive & ar, const unsigned int /* file_version */)
49+
{
5050
ar & cnt;
5151
}
5252

boost/headers/boost/accumulators/statistics/extended_p_square_quantile.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ namespace impl
7676
boost::begin(args[extended_p_square_probabilities])
7777
, boost::end(args[extended_p_square_probabilities])
7878
)
79+
, probability()
7980
{
8081
}
8182

boost/headers/boost/accumulators/statistics/max.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ namespace impl
5050

5151
// make this accumulator serializeable
5252
template<class Archive>
53-
void serialize(Archive & ar, const unsigned int file_version)
54-
{
53+
void serialize(Archive & ar, const unsigned int /* file_version */)
54+
{
5555
ar & max_;
5656
}
5757

boost/headers/boost/accumulators/statistics/mean.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace impl
4444

4545
// serialization is done by accumulators it depends on
4646
template<class Archive>
47-
void serialize(Archive & ar, const unsigned int file_version) {}
47+
void serialize(Archive & /* ar */, const unsigned int /* file_version */) {}
4848
};
4949

5050
template<typename Sample, typename Tag>
@@ -76,8 +76,8 @@ namespace impl
7676
}
7777

7878
template<class Archive>
79-
void serialize(Archive & ar, const unsigned int file_version)
80-
{
79+
void serialize(Archive & ar, const unsigned int /* file_version */)
80+
{
8181
ar & mean;
8282
}
8383

boost/headers/boost/accumulators/statistics/min.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ namespace impl
5050

5151
// make this accumulator serializeable
5252
template<class Archive>
53-
void serialize(Archive & ar, const unsigned int file_version)
54-
{
53+
void serialize(Archive & ar, const unsigned int /* file_version */)
54+
{
5555
ar & min_;
5656
}
5757

0 commit comments

Comments
 (0)