Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BH 1.84.0-0 Pre-Relase with Boost 1.84.0 #98

Merged
merged 6 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Get Script
run: curl -OLs https://eddelbuettel.github.io/r-ci/run.sh && chmod 0755 run.sh
Expand Down
14 changes: 14 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
2023-12-15 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Pre-Release 1.84.0-0

* .github/workflows/ci.yaml (jobs): Update to actions/checkout@v4

2023-12-13 Dirk Eddelbuettel <[email protected]>

* inst/include/boost/*: Upgraded to Boost 1.84, as usual with two
patch sets from CRAN demands on file path length and diagnostics
* local/patches/bh_1.84.0-0.diagnostics-two.patch: Added

* local/scripts/CreateBoost.sh: Update for 1.84.0, added url

2023-01-17 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Release 1.81.0-1
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: BH
Type: Package
Title: Boost C++ Header Files
Version: 1.81.0-1
Date: 2023-01-17
Version: 1.84.0-0
Date: 2023-12-15
Author: Dirk Eddelbuettel, John W. Emerson and Michael J. Kane
Maintainer: Dirk Eddelbuettel <[email protected]>
Description: Boost provides free peer-reviewed portable C++ source
Expand Down
7 changes: 7 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
\newcommand{\ghit}{\href{https://github.com/eddelbuettel/bh/issues/#1}{##1}}
\newcommand{\ghpr}{\href{https://github.com/eddelbuettel/bh/pull/#1}{##1}}

\section{Changes in version 1.84.0-0 (2023-12-15)}{
\itemize{
\item Pre-release to allow work on five affected packages
\item Upgrade to \boost 1.81.0 (\ghpr{87})
}
}

\section{Changes in version 1.81.0-1 (2023-01-17)}{
\itemize{
\item Upgrade to \boost 1.81.0 (\ghpr{87})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ namespace detail
{
}

accumulator_visitor(accumulator_visitor const &other)
: args(other.args)
{
}

template<typename Accumulator>
void operator ()(Accumulator &accumulator) const
{
accumulator(this->args);
}

private:
accumulator_visitor &operator =(accumulator_visitor const &);
BOOST_DELETED_FUNCTION(accumulator_visitor &operator =(accumulator_visitor const &))
Args const &args;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ namespace boost { namespace accumulators
{
}

add_ref_visitor(add_ref_visitor const &other)
: args_(other.args_)
{
}

template<typename Accumulator>
void operator ()(Accumulator &acc) const
{
Expand All @@ -49,7 +54,7 @@ namespace boost { namespace accumulators
}

private:
add_ref_visitor &operator =(add_ref_visitor const &);
BOOST_DELETED_FUNCTION(add_ref_visitor &operator =(add_ref_visitor const &))
Args const &args_;
};

Expand Down Expand Up @@ -87,7 +92,7 @@ namespace boost { namespace accumulators
}

private:
drop_visitor &operator =(drop_visitor const &);
BOOST_DELETED_FUNCTION(drop_visitor &operator =(drop_visitor const &))
Args const &args_;
};

Expand Down Expand Up @@ -227,7 +232,7 @@ namespace boost { namespace accumulators
}

private:
with_cached_result &operator =(with_cached_result const &);
BOOST_DELETED_FUNCTION(with_cached_result &operator =(with_cached_result const &))

void set(result_type const &r)
{
Expand Down
6 changes: 6 additions & 0 deletions inst/include/boost/accumulators/framework/depends_on.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,12 @@ namespace boost { namespace accumulators
{
}

accumulator_wrapper& operator=(accumulator_wrapper const &that)
{
*static_cast<Accumulator *>(this) = *static_cast<Accumulator const *>(&that);
return *this;
}

template<typename Args>
accumulator_wrapper(Args const &args)
: Accumulator(args)
Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/count.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & cnt;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ namespace impl
boost::begin(args[extended_p_square_probabilities])
, boost::end(args[extended_p_square_probabilities])
)
, probability()
{
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/max.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & max_;
}

Expand Down
6 changes: 3 additions & 3 deletions inst/include/boost/accumulators/statistics/mean.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace impl

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

template<typename Sample, typename Tag>
Expand Down Expand Up @@ -76,8 +76,8 @@ namespace impl
}

template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & mean;
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/min.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & min_;
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/moment.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & sum;
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/sum.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ namespace impl
}

template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & sum;
}

Expand Down
4 changes: 2 additions & 2 deletions inst/include/boost/accumulators/statistics/tail.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ namespace detail
}

private:
stat_assign_visitor &operator =(stat_assign_visitor const &);
BOOST_DELETED_FUNCTION(stat_assign_visitor &operator =(stat_assign_visitor const &))
Args const &args;
std::size_t index;
};
Expand Down Expand Up @@ -264,7 +264,7 @@ namespace impl
}

private:
indirect_cmp &operator =(indirect_cmp const &);
BOOST_DELETED_FUNCTION(indirect_cmp &operator =(indirect_cmp const &))
std::vector<Sample> const &samples;
};

Expand Down
6 changes: 3 additions & 3 deletions inst/include/boost/accumulators/statistics/variance.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace impl

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

//! Iterative calculation of variance.
Expand Down Expand Up @@ -119,8 +119,8 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
{
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & variance;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & mean;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace impl

// make this accumulator serializeable
template<class Archive>
void serialize(Archive & ar, const unsigned int file_version)
void serialize(Archive & ar, const unsigned int /* file_version */)
{
ar & weighted_sum_;
}
Expand Down
12 changes: 6 additions & 6 deletions inst/include/boost/algorithm/gather.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Copyright 2008 Adobe Systems Incorporated

Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand Down Expand Up @@ -84,7 +84,7 @@ namespace boost { namespace algorithm {
template <
typename BidirectionalIterator, // models BidirectionalIterator
typename Pred> // models UnaryPredicate
std::pair<BidirectionalIterator, BidirectionalIterator> gather
std::pair<BidirectionalIterator, BidirectionalIterator> gather
( BidirectionalIterator first, BidirectionalIterator last, BidirectionalIterator pivot, Pred pred )
{
// The first call partitions everything up to (but not including) the pivot element,
Expand All @@ -106,11 +106,11 @@ template <
typename BidirectionalRange, //
typename Pred> // Pred models UnaryPredicate
std::pair<
typename boost::range_iterator<const BidirectionalRange>::type,
typename boost::range_iterator<const BidirectionalRange>::type>
typename boost::range_iterator<BidirectionalRange>::type,
typename boost::range_iterator<BidirectionalRange>::type>
gather (
const BidirectionalRange &range,
typename boost::range_iterator<const BidirectionalRange>::type pivot,
BidirectionalRange &range,
typename boost::range_iterator<BidirectionalRange>::type pivot,
Pred pred )
{
return boost::algorithm::gather ( boost::begin ( range ), boost::end ( range ), pivot, pred );
Expand Down
Loading