fix usage of boost's deprecated header

This commit is contained in:
David Callu 2020-05-26 12:51:11 +02:00
parent 6b3a447a1b
commit 3d7695eeb2
2 changed files with 6 additions and 6 deletions

View file

@ -19,7 +19,7 @@
#include <boost/type_traits/common_type.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <boost/type_traits/has_equal_to.hpp>
#include <boost/test/floating_point_comparison.hpp>
#include <boost/test/tools/floating_point_comparison.hpp>
namespace mock
{

View file

@ -14,7 +14,7 @@
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/erase.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/detail/sp_typeinfo.hpp>
#include <boost/core/typeinfo.hpp>
#include <boost/shared_ptr.hpp>
#include <stdexcept>
#include <typeinfo>
@ -24,7 +24,7 @@
#include <cstdlib>
#endif
#define MOCK_TYPE_NAME( t ) mock::detail::type_name( BOOST_SP_TYPEID(t) )
#define MOCK_TYPE_NAME( t ) mock::detail::type_name( BOOST_CORE_TYPEID(t) )
namespace mock
{
@ -33,7 +33,7 @@ namespace detail
class type_name
{
public:
explicit type_name( const boost::detail::sp_typeinfo& info )
explicit type_name( const boost::core::typeinfo& info )
: info_( &info )
{}
friend std::ostream& operator<<( std::ostream& s, const type_name& t )
@ -43,7 +43,7 @@ namespace detail
}
private:
void serialize( std::ostream& s,
const boost::detail::sp_typeinfo& info ) const
const boost::core::typeinfo& info ) const
{
const char* name = info.name();
#ifdef __GNUC__
@ -108,7 +108,7 @@ namespace detail
return std::string::npos;
}
const boost::detail::sp_typeinfo* info_;
const boost::core::typeinfo* info_;
};
}
} // mock