mirror of
https://github.com/mat007/turtle.git
synced 2026-06-22 12:13:43 +00:00
Replace deprecated boost sp_typeinfo.hpp
This commit is contained in:
parent
e78d548e04
commit
b3c4829f15
1 changed files with 8 additions and 4 deletions
|
|
@ -14,7 +14,11 @@
|
|||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/algorithm/string/erase.hpp>
|
||||
#include <boost/algorithm/string/trim.hpp>
|
||||
#if BOOST_VERSION >= 107000
|
||||
#include <boost/core/typeinfo.hpp>
|
||||
#else
|
||||
#include <boost/detail/sp_typeinfo.hpp>
|
||||
#endif
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <stdexcept>
|
||||
#include <typeinfo>
|
||||
|
|
@ -24,7 +28,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 +37,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 +47,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 +112,7 @@ namespace detail
|
|||
return std::string::npos;
|
||||
}
|
||||
|
||||
const boost::detail::sp_typeinfo* info_;
|
||||
const boost::core::typeinfo* info_;
|
||||
};
|
||||
}
|
||||
} // mock
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue