From ce5271d7da113c46551e3fcb4b3d955a602b3b13 Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sat, 21 Oct 2023 15:31:24 -0500 Subject: [PATCH 1/7] got rid of boost deprecation warnings --- src/agent.h | 2 +- src/any.hpp | 24 ++++++++++++------------ src/bid.h | 2 +- src/bid_portfolio.h | 1 + src/capacity_constraint.h | 1 + src/composition.h | 1 + src/exchange_graph.h | 3 ++- src/material.h | 1 + src/product.h | 1 + src/request.h | 2 +- src/request_portfolio.h | 1 + src/res_tracker.h | 2 +- src/resource.h | 1 + src/sqlite_db.h | 1 + src/toolkit/infile_converters.cc | 1 + src/toolkit/symbolic_functions.h | 1 + src/xml_file_loader.h | 1 + src/xml_parser.h | 2 +- 18 files changed, 30 insertions(+), 18 deletions(-) diff --git a/src/agent.h b/src/agent.h index a3c53e24a9..ece9598f5c 100644 --- a/src/agent.h +++ b/src/agent.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "db_init.h" #include "dynamic_module.h" diff --git a/src/any.hpp b/src/any.hpp index 36b84343d1..573e12f1a1 100644 --- a/src/any.hpp +++ b/src/any.hpp @@ -53,7 +53,7 @@ original Boost 1.54.0 #include #include #include -#include +#include #include #include @@ -74,7 +74,7 @@ namespace boost { namespace spirit struct bad_any_cast : std::bad_cast { - bad_any_cast(boost::detail::sp_typeinfo const& src, boost::detail::sp_typeinfo const& dest) + bad_any_cast(boost::core::typeinfo const& src, boost::core::typeinfo const& dest) : from(src.name()), to(dest.name()) {} @@ -90,7 +90,7 @@ namespace boost { namespace spirit template struct fxn_ptr_table { - boost::detail::sp_typeinfo const& (*get_type)(); + boost::core::typeinfo const& (*get_type)(); void (*static_delete)(void**); void (*destruct)(void**); void (*clone)(void* const*, void**); @@ -107,9 +107,9 @@ namespace boost { namespace spirit template struct type { - static boost::detail::sp_typeinfo const& get_type() + static boost::core::typeinfo const& get_type() { - return BOOST_SP_TYPEID(T); + return BOOST_CORE_TYPEID(T); } static void static_delete(void** x) { @@ -138,9 +138,9 @@ namespace boost { namespace spirit template struct type { - static boost::detail::sp_typeinfo const& get_type() + static boost::core::typeinfo const& get_type() { - return BOOST_SP_TYPEID(T); + return BOOST_CORE_TYPEID(T); } static void static_delete(void** x) { @@ -300,7 +300,7 @@ namespace boost { namespace spirit return *this; } - boost::detail::sp_typeinfo const& type() const + boost::core::typeinfo const& type() const { return table->get_type(); } @@ -308,8 +308,8 @@ namespace boost { namespace spirit template T const& cast() const { - if (type() != BOOST_SP_TYPEID(T)) - throw bad_any_cast(type(), BOOST_SP_TYPEID(T)); + if (type() != BOOST_CORE_TYPEID(T)) + throw bad_any_cast(type(), BOOST_CORE_TYPEID(T)); return spirit::detail::get_table::is_small::value ? *reinterpret_cast(&object) : @@ -359,7 +359,7 @@ namespace boost { namespace spirit template inline T* any_cast (basic_hold_any* operand) { - if (operand && operand->type() == BOOST_SP_TYPEID(T)) { + if (operand && operand->type() == BOOST_CORE_TYPEID(T)) { return spirit::detail::get_table::is_small::value ? reinterpret_cast(&operand->object) : reinterpret_cast(operand->object); @@ -390,7 +390,7 @@ namespace boost { namespace spirit nonref* result = any_cast(&operand); if(!result) - boost::throw_exception(bad_any_cast(operand.type(), BOOST_SP_TYPEID(T))); + boost::throw_exception(bad_any_cast(operand.type(), BOOST_CORE_TYPEID(T))); return *result; } diff --git a/src/bid.h b/src/bid.h index 1403e1849d..a1bd3f1156 100644 --- a/src/bid.h +++ b/src/bid.h @@ -1,8 +1,8 @@ #ifndef CYCLUS_SRC_BID_H_ #define CYCLUS_SRC_BID_H_ +#include #include -#include #include #include "request.h" diff --git a/src/bid_portfolio.h b/src/bid_portfolio.h index 855c74b7e5..f402adfc11 100644 --- a/src/bid_portfolio.h +++ b/src/bid_portfolio.h @@ -5,6 +5,7 @@ #include #include +#include #include #include "bid.h" diff --git a/src/capacity_constraint.h b/src/capacity_constraint.h index fa5bcd32de..c6fe8ff1fe 100644 --- a/src/capacity_constraint.h +++ b/src/capacity_constraint.h @@ -1,6 +1,7 @@ #ifndef CYCLUS_SRC_CAPACITY_CONSTRAINT_H_ #define CYCLUS_SRC_CAPACITY_CONSTRAINT_H_ +#include #include #include "error.h" diff --git a/src/composition.h b/src/composition.h index cf6aca5dfe..994c740a37 100644 --- a/src/composition.h +++ b/src/composition.h @@ -3,6 +3,7 @@ #include #include +#include #include class SimInitTest; diff --git a/src/exchange_graph.h b/src/exchange_graph.h index 7eaa6a6f01..fd0401f45c 100644 --- a/src/exchange_graph.h +++ b/src/exchange_graph.h @@ -7,8 +7,9 @@ #include #include -#include +#include #include +#include namespace cyclus { diff --git a/src/material.h b/src/material.h index 958cac7498..a406ff27a9 100644 --- a/src/material.h +++ b/src/material.h @@ -2,6 +2,7 @@ #define CYCLUS_SRC_MATERIAL_H_ #include +#include #include #include "composition.h" diff --git a/src/product.h b/src/product.h index 6f0e9ee8c7..6fd626a596 100644 --- a/src/product.h +++ b/src/product.h @@ -1,6 +1,7 @@ #ifndef CYCLUS_SRC_PRODUCT_H_ #define CYCLUS_SRC_PRODUCT_H_ +#include #include #include "context.h" diff --git a/src/request.h b/src/request.h index 44a61510a3..70a9c52832 100644 --- a/src/request.h +++ b/src/request.h @@ -5,8 +5,8 @@ #include #include +#include #include -#include namespace cyclus { diff --git a/src/request_portfolio.h b/src/request_portfolio.h index 003f1f0e7a..3999721521 100644 --- a/src/request_portfolio.h +++ b/src/request_portfolio.h @@ -8,6 +8,7 @@ #include #include +#include #include #include "capacity_constraint.h" diff --git a/src/res_tracker.h b/src/res_tracker.h index 8c1772ca31..250b44a31e 100644 --- a/src/res_tracker.h +++ b/src/res_tracker.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "context.h" #include "resource.h" diff --git a/src/resource.h b/src/resource.h index b13b52431e..c9bfb9a5c5 100644 --- a/src/resource.h +++ b/src/resource.h @@ -3,6 +3,7 @@ #include #include +#include #include class SimInitTest; diff --git a/src/sqlite_db.h b/src/sqlite_db.h index 9e1bf66bbc..135862a085 100644 --- a/src/sqlite_db.h +++ b/src/sqlite_db.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "error.h" diff --git a/src/toolkit/infile_converters.cc b/src/toolkit/infile_converters.cc index ac49b780cd..e1d94c4359 100644 --- a/src/toolkit/infile_converters.cc +++ b/src/toolkit/infile_converters.cc @@ -1,5 +1,6 @@ #include +#include #include #include diff --git a/src/toolkit/symbolic_functions.h b/src/toolkit/symbolic_functions.h index 1412ab062d..ccfe363589 100644 --- a/src/toolkit/symbolic_functions.h +++ b/src/toolkit/symbolic_functions.h @@ -4,6 +4,7 @@ #include #include +#include #include namespace cyclus { diff --git a/src/xml_file_loader.h b/src/xml_file_loader.h index aabd136312..c0d0985673 100644 --- a/src/xml_file_loader.h +++ b/src/xml_file_loader.h @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "composition.h" diff --git a/src/xml_parser.h b/src/xml_parser.h index 1eed2d5b35..eaed81fa32 100644 --- a/src/xml_parser.h +++ b/src/xml_parser.h @@ -2,7 +2,7 @@ #define CYCLUS_SRC_XML_PARSER_H_ #include -#include +#include namespace xmlpp { class DomParser; From dc3a2eedf55a3b9b5258b8fe2e8af9f4fba50af0 Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sat, 21 Oct 2023 16:33:00 -0500 Subject: [PATCH 2/7] got rid of unnecessary typeinfo headers --- src/agent.h | 2 -- src/bid.h | 1 - src/bid_portfolio.h | 1 - src/capacity_constraint.h | 1 - src/composition.h | 1 - src/exchange_graph.h | 1 - src/material.h | 1 - src/product.h | 1 - src/request.h | 1 - src/request_portfolio.h | 1 - src/res_tracker.h | 1 - src/resource.h | 1 - src/toolkit/infile_converters.cc | 1 - src/toolkit/symbolic_functions.h | 1 - src/xml_file_loader.h | 1 - src/xml_parser.h | 1 - 16 files changed, 17 deletions(-) diff --git a/src/agent.h b/src/agent.h index ece9598f5c..e6f10d721b 100644 --- a/src/agent.h +++ b/src/agent.h @@ -6,8 +6,6 @@ #include #include -#include - #include "db_init.h" #include "dynamic_module.h" #include "infile_tree.h" diff --git a/src/bid.h b/src/bid.h index a1bd3f1156..e4f3122334 100644 --- a/src/bid.h +++ b/src/bid.h @@ -1,7 +1,6 @@ #ifndef CYCLUS_SRC_BID_H_ #define CYCLUS_SRC_BID_H_ -#include #include #include diff --git a/src/bid_portfolio.h b/src/bid_portfolio.h index f402adfc11..855c74b7e5 100644 --- a/src/bid_portfolio.h +++ b/src/bid_portfolio.h @@ -5,7 +5,6 @@ #include #include -#include #include #include "bid.h" diff --git a/src/capacity_constraint.h b/src/capacity_constraint.h index c6fe8ff1fe..fa5bcd32de 100644 --- a/src/capacity_constraint.h +++ b/src/capacity_constraint.h @@ -1,7 +1,6 @@ #ifndef CYCLUS_SRC_CAPACITY_CONSTRAINT_H_ #define CYCLUS_SRC_CAPACITY_CONSTRAINT_H_ -#include #include #include "error.h" diff --git a/src/composition.h b/src/composition.h index 994c740a37..cf6aca5dfe 100644 --- a/src/composition.h +++ b/src/composition.h @@ -3,7 +3,6 @@ #include #include -#include #include class SimInitTest; diff --git a/src/exchange_graph.h b/src/exchange_graph.h index fd0401f45c..7a21a1be4a 100644 --- a/src/exchange_graph.h +++ b/src/exchange_graph.h @@ -7,7 +7,6 @@ #include #include -#include #include #include diff --git a/src/material.h b/src/material.h index a406ff27a9..958cac7498 100644 --- a/src/material.h +++ b/src/material.h @@ -2,7 +2,6 @@ #define CYCLUS_SRC_MATERIAL_H_ #include -#include #include #include "composition.h" diff --git a/src/product.h b/src/product.h index 6fd626a596..6f0e9ee8c7 100644 --- a/src/product.h +++ b/src/product.h @@ -1,7 +1,6 @@ #ifndef CYCLUS_SRC_PRODUCT_H_ #define CYCLUS_SRC_PRODUCT_H_ -#include #include #include "context.h" diff --git a/src/request.h b/src/request.h index 70a9c52832..6b7707f236 100644 --- a/src/request.h +++ b/src/request.h @@ -5,7 +5,6 @@ #include #include -#include #include namespace cyclus { diff --git a/src/request_portfolio.h b/src/request_portfolio.h index 3999721521..003f1f0e7a 100644 --- a/src/request_portfolio.h +++ b/src/request_portfolio.h @@ -8,7 +8,6 @@ #include #include -#include #include #include "capacity_constraint.h" diff --git a/src/res_tracker.h b/src/res_tracker.h index 250b44a31e..59e73b540a 100644 --- a/src/res_tracker.h +++ b/src/res_tracker.h @@ -3,7 +3,6 @@ #include #include -#include #include "context.h" #include "resource.h" diff --git a/src/resource.h b/src/resource.h index c9bfb9a5c5..b13b52431e 100644 --- a/src/resource.h +++ b/src/resource.h @@ -3,7 +3,6 @@ #include #include -#include #include class SimInitTest; diff --git a/src/toolkit/infile_converters.cc b/src/toolkit/infile_converters.cc index e1d94c4359..ac49b780cd 100644 --- a/src/toolkit/infile_converters.cc +++ b/src/toolkit/infile_converters.cc @@ -1,6 +1,5 @@ #include -#include #include #include diff --git a/src/toolkit/symbolic_functions.h b/src/toolkit/symbolic_functions.h index ccfe363589..1412ab062d 100644 --- a/src/toolkit/symbolic_functions.h +++ b/src/toolkit/symbolic_functions.h @@ -4,7 +4,6 @@ #include #include -#include #include namespace cyclus { diff --git a/src/xml_file_loader.h b/src/xml_file_loader.h index c0d0985673..aabd136312 100644 --- a/src/xml_file_loader.h +++ b/src/xml_file_loader.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include "composition.h" diff --git a/src/xml_parser.h b/src/xml_parser.h index eaed81fa32..1b1aa5d7bd 100644 --- a/src/xml_parser.h +++ b/src/xml_parser.h @@ -2,7 +2,6 @@ #define CYCLUS_SRC_XML_PARSER_H_ #include -#include namespace xmlpp { class DomParser; From 672da8c421b7f2b559226694fe1fb6050b5328c4 Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sat, 21 Oct 2023 16:33:38 -0500 Subject: [PATCH 3/7] missed one --- src/sqlite_db.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sqlite_db.h b/src/sqlite_db.h index 135862a085..9e1bf66bbc 100644 --- a/src/sqlite_db.h +++ b/src/sqlite_db.h @@ -3,7 +3,6 @@ #include #include -#include #include #include "error.h" From 2ef0a5bc7e3d23fc447bd3b8d5f0dcdf6f4f63bf Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sat, 21 Oct 2023 16:42:14 -0500 Subject: [PATCH 4/7] added explicit #include where they should be --- src/bid.h | 1 + src/greedy_solver.h | 1 + src/request.h | 1 + src/toolkit/symbolic_function_factories.h | 1 + tests/integ_tests.cc | 1 + 5 files changed, 5 insertions(+) diff --git a/src/bid.h b/src/bid.h index e4f3122334..1403e1849d 100644 --- a/src/bid.h +++ b/src/bid.h @@ -2,6 +2,7 @@ #define CYCLUS_SRC_BID_H_ #include +#include #include #include "request.h" diff --git a/src/greedy_solver.h b/src/greedy_solver.h index 610846a6bc..767f7315ad 100644 --- a/src/greedy_solver.h +++ b/src/greedy_solver.h @@ -1,6 +1,7 @@ #ifndef CYCLUS_SRC_GREEDY_SOLVER_H_ #define CYCLUS_SRC_GREEDY_SOLVER_H_ +#include #include "exchange_graph.h" #include "exchange_solver.h" #include "greedy_preconditioner.h" diff --git a/src/request.h b/src/request.h index 6b7707f236..44a61510a3 100644 --- a/src/request.h +++ b/src/request.h @@ -6,6 +6,7 @@ #include #include +#include namespace cyclus { diff --git a/src/toolkit/symbolic_function_factories.h b/src/toolkit/symbolic_function_factories.h index 2184eb3fda..0dfefd95bb 100644 --- a/src/toolkit/symbolic_function_factories.h +++ b/src/toolkit/symbolic_function_factories.h @@ -4,6 +4,7 @@ #include #include #include +#include #include "symbolic_functions.h" diff --git a/tests/integ_tests.cc b/tests/integ_tests.cc index 785d073c27..694c04f0af 100644 --- a/tests/integ_tests.cc +++ b/tests/integ_tests.cc @@ -1,6 +1,7 @@ #include #include +#include #include "cyclus.h" #include "platform.h" From 92414ee63a276691d7e2c0d93437acc1814ff76e Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sat, 21 Oct 2023 16:58:59 -0500 Subject: [PATCH 5/7] update changelog --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7ac3e4e828..a315c11bfe 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -36,6 +36,7 @@ Since last release * Issue #1312. (#1560) * fix sell_policy that was offering bids when capacity was inbetween 0 and the quantize, bids that one was not able to fullfill and caused cyclus to crash. (#1552) +* Deprecation warnings involving (#1611) From f7553404ca0d5b8f9dde5a0635495e36a0c36e29 Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sun, 22 Oct 2023 14:17:47 -0500 Subject: [PATCH 6/7] checked out .github to main --- .github/workflows/build_test.yml | 2 ++ .github/workflows/build_test_publish.yml | 3 ++- .github/workflows/publish_release.yml | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 95aa501ffb..a8cc6e649e 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -24,6 +24,7 @@ jobs: fail-fast: false matrix: ubuntu_versions : [ + 20.04, 22.04, ] pkg_mgr : [ @@ -40,6 +41,7 @@ jobs: - name: Building Cyclus run: | + mkdir -p `python -m site --user-site` python install.py -j 2 --build-type=Release --core-version 999999.999999 echo "PATH=${HOME}/.local/bin:$PATH" >> "$GITHUB_ENV" echo "LD_LIBRARY_PATH=${HOME}/.local/lib:${HOME}/.local/lib/cyclus:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml index 9d9c326be1..176264cf6b 100644 --- a/.github/workflows/build_test_publish.yml +++ b/.github/workflows/build_test_publish.yml @@ -21,6 +21,7 @@ jobs: strategy: matrix: ubuntu_versions : [ + 20.04, 22.04, ] pkg_mgr : [ @@ -59,4 +60,4 @@ jobs: parallel: true tag-latest-on-default: ${{ env.tag-latest-on-default }} dockerfile: docker/Dockerfile - build-args: pkg_mgr=${{ matrix.pkg_mgr }} \ No newline at end of file + build-args: pkg_mgr=${{ matrix.pkg_mgr }}, ubuntu_version=${{ matrix.ubuntu_versions }} \ No newline at end of file diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index dc697bb72f..b52b924fd0 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -12,6 +12,7 @@ jobs: fail-fast: false matrix: ubuntu_versions : [ + 20.04, 22.04, ] pkg_mgr : [ @@ -50,4 +51,4 @@ jobs: parallel: true tag-latest-on-default: ${{ env.tag-latest-on-default }} dockerfile: docker/Dockerfile - build-args: pkg_mgr=${{ matrix.pkg_mgr }} \ No newline at end of file + build-args: pkg_mgr=${{ matrix.pkg_mgr }}, ubuntu_version=${{ matrix.ubuntu_versions }} \ No newline at end of file From c36a7628d4a9afbe286e657e5e7967f3706be22b Mon Sep 17 00:00:00 2001 From: bennibbelink Date: Sun, 22 Oct 2023 14:20:01 -0500 Subject: [PATCH 7/7] revert last commit --- .github/workflows/build_test.yml | 2 -- .github/workflows/build_test_publish.yml | 3 +-- .github/workflows/publish_release.yml | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index a8cc6e649e..95aa501ffb 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -24,7 +24,6 @@ jobs: fail-fast: false matrix: ubuntu_versions : [ - 20.04, 22.04, ] pkg_mgr : [ @@ -41,7 +40,6 @@ jobs: - name: Building Cyclus run: | - mkdir -p `python -m site --user-site` python install.py -j 2 --build-type=Release --core-version 999999.999999 echo "PATH=${HOME}/.local/bin:$PATH" >> "$GITHUB_ENV" echo "LD_LIBRARY_PATH=${HOME}/.local/lib:${HOME}/.local/lib/cyclus:$LD_LIBRARY_PATH" >> "$GITHUB_ENV" diff --git a/.github/workflows/build_test_publish.yml b/.github/workflows/build_test_publish.yml index 176264cf6b..9d9c326be1 100644 --- a/.github/workflows/build_test_publish.yml +++ b/.github/workflows/build_test_publish.yml @@ -21,7 +21,6 @@ jobs: strategy: matrix: ubuntu_versions : [ - 20.04, 22.04, ] pkg_mgr : [ @@ -60,4 +59,4 @@ jobs: parallel: true tag-latest-on-default: ${{ env.tag-latest-on-default }} dockerfile: docker/Dockerfile - build-args: pkg_mgr=${{ matrix.pkg_mgr }}, ubuntu_version=${{ matrix.ubuntu_versions }} \ No newline at end of file + build-args: pkg_mgr=${{ matrix.pkg_mgr }} \ No newline at end of file diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index b52b924fd0..dc697bb72f 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -12,7 +12,6 @@ jobs: fail-fast: false matrix: ubuntu_versions : [ - 20.04, 22.04, ] pkg_mgr : [ @@ -51,4 +50,4 @@ jobs: parallel: true tag-latest-on-default: ${{ env.tag-latest-on-default }} dockerfile: docker/Dockerfile - build-args: pkg_mgr=${{ matrix.pkg_mgr }}, ubuntu_version=${{ matrix.ubuntu_versions }} \ No newline at end of file + build-args: pkg_mgr=${{ matrix.pkg_mgr }} \ No newline at end of file