Merge pull request cyclus#1611 from bennibbelink/boost-warnings

abachma2 · Oct 22, 2023 · 00b4c4d · 00b4c4d
2 parents 018ee48 + c36a762
commit 00b4c4d
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git 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 <boost/detail/sp_typeinfo.hpp> (#1611)
 
 
 

diff --git a/src/agent.h b/src/agent.h
@@ -6,8 +6,6 @@
 #include <string>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
-
 #include "db_init.h"
 #include "dynamic_module.h"
 #include "infile_tree.h"

diff --git a/src/any.hpp b/src/any.hpp
@@ -53,7 +53,7 @@ original Boost 1.54.0
 #include <boost/static_assert.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/assert.hpp>
-#include <boost/detail/sp_typeinfo.hpp>
+#include <boost/core/typeinfo.hpp>
 
 #include <stdexcept>
 #include <typeinfo>
@@ -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 <typename Char>
         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<typename T, typename Char>
             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<typename T, typename Char>
             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,16 +300,16 @@ namespace boost { namespace spirit
             return *this;
         }
 
-        boost::detail::sp_typeinfo const& type() const
+        boost::core::typeinfo const& type() const
         {
             return table->get_type();
         }
 
         template <typename T>
         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<T>::is_small::value ?
                 *reinterpret_cast<T const*>(&object) :
@@ -359,7 +359,7 @@ namespace boost { namespace spirit
     template <typename T, typename Char>
     inline T* any_cast (basic_hold_any<Char>* operand)
     {
-        if (operand && operand->type() == BOOST_SP_TYPEID(T)) {
+        if (operand && operand->type() == BOOST_CORE_TYPEID(T)) {
             return spirit::detail::get_table<T>::is_small::value ?
                 reinterpret_cast<T*>(&operand->object) :
                 reinterpret_cast<T*>(operand->object);
@@ -390,7 +390,7 @@ namespace boost { namespace spirit
 
         nonref* result = any_cast<nonref>(&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/exchange_graph.h b/src/exchange_graph.h
@@ -7,8 +7,8 @@
 #include <utility>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 
 namespace cyclus {
 

diff --git 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 <boost/shared_ptr.hpp>
 #include "exchange_graph.h"
 #include "exchange_solver.h"
 #include "greedy_preconditioner.h"

diff --git a/src/res_tracker.h b/src/res_tracker.h
@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
 #include "context.h"
 #include "resource.h"

diff --git a/src/toolkit/symbolic_function_factories.h b/src/toolkit/symbolic_function_factories.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <map>
 #include <sstream>
+#include <boost/shared_ptr.hpp>
 
 #include "symbolic_functions.h"
 

diff --git a/src/xml_parser.h b/src/xml_parser.h
@@ -2,7 +2,6 @@
 #define CYCLUS_SRC_XML_PARSER_H_
 
 #include <sstream>
-#include <boost/shared_ptr.hpp>
 
 namespace xmlpp {
   class DomParser;

diff --git a/tests/integ_tests.cc b/tests/integ_tests.cc
@@ -1,6 +1,7 @@
 #include <cmath>
 
 #include <gtest/gtest.h>
+#include <boost/shared_ptr.hpp>
 
 #include "cyclus.h"
 #include "platform.h"