Skip to content

Commit b653312

Browse files
authored
Merge pull request #600 from jschueller/ciso646
Drop ciso646 deprecated header
2 parents ac7b6d2 + fa06453 commit b653312

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

config.hpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ see https://www.gnu.org/licenses/. */
3131

3232
// NOTE: include this so that we can
3333
// detect _LIBCPP_VERSION below.
34-
#include <ciso646>
34+
#include <vector>
3535

3636
// Start of defines instantiated by CMake.
3737
// clang-format off

include/pagmo/algorithms/ipopt.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ PAGMO_DLL_PUBLIC unsigned ipopt_internal_test();
9494
* - *numeric* options (i.e., the type of the option is ``double``).
9595
*
9696
* The full list of options is available on the
97-
* <a href="https://www.coin-or.org/Ipopt/documentation/node40.html">Ipopt website</a>. pagmo::ipopt allows to configure
97+
* <a href="https://coin-or.github.io/Ipopt/OPTIONS.html">Ipopt website</a>. pagmo::ipopt allows to configure
9898
* any Ipopt option via methods such as ipopt::set_string_options(), ipopt::set_string_option(),
9999
* ipopt::set_integer_options(), etc., which need to be used before invoking ipopt::evolve().
100100
*
101101
* If the user does not set any option, pagmo::ipopt will use Ipopt's default values for the options (see the
102-
* <a href="https://www.coin-or.org/Ipopt/documentation/node40.html">documentation</a>), with the following
102+
* <a href="https://coin-or.github.io/Ipopt/OPTIONS.html">documentation</a>), with the following
103103
* modifications:
104104
* - if the ``"print_level"`` integer option is **not** set by the user, it will be set to 0 by pagmo::ipopt (this will
105105
* suppress most screen output produced by the solver - note that we support an alternative form of logging via

tools/gha_deploydocs.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ set -e
1010
sudo apt-get install wget
1111

1212
# Install conda+deps.
13-
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
13+
wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
1414
export deps_dir=$HOME/local
15-
export PATH="$HOME/miniconda/bin:$PATH"
16-
bash miniconda.sh -b -p $HOME/miniconda
17-
conda config --add channels conda-forge
18-
conda config --set channel_priority strict
19-
conda install mamba
20-
mamba create -y -q -p $deps_dir c-compiler cxx-compiler cmake eigen nlopt ipopt boost-cpp tbb tbb-devel python=3.10 sphinx=4.5.0 sphinx-book-theme breathe doxygen graphviz
15+
export PATH="$HOME/miniforge/bin:$PATH"
16+
bash miniforge.sh -b -p $HOME/miniforge
17+
conda create -y -q -p $deps_dir c-compiler cxx-compiler cmake eigen nlopt ipopt boost-cpp tbb tbb-devel python=3.10 sphinx=4.5.0 sphinx-book-theme breathe "doxygen<1.13" graphviz
2118
source activate $deps_dir
2219

2320
## Create the build dir and cd into it.

0 commit comments

Comments
 (0)