Skip to content

Use Boost.TypeIndex CTTI to implement type info when RTTI is not enabled #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lastique wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use Boost.TypeIndex CTTI to implement type info when RTTI is not enabled #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions include/boost/statechart/detail/rtti_policy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
#include <boost/assert.hpp>
#include <boost/config.hpp> // BOOST_MSVC
#include <boost/detail/workaround.hpp>
#if !defined(BOOST_STATECHART_USE_NATIVE_RTTI)
Copy link
Collaborator

@jeking3 jeking3 Oct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to worry about BOOST_NO_RTTI here?

Is this macro new? - does it need documentation and additional test cases?

Copy link
Member Author

@Lastique Lastique Oct 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to avoid including Boost.TypeIndex when not needed. The macro is not new, it is already documented and is tested by *Native tests.

#include <boost/type_index/ctti_type_index.hpp>
#endif

#include <typeinfo> // std::type_info



namespace boost
{
namespace statechart
Expand All @@ -24,10 +26,12 @@ namespace detail
{


#if !defined(BOOST_STATECHART_USE_NATIVE_RTTI)

//////////////////////////////////////////////////////////////////////////////
struct id_provider
{
const boost::typeindex::ctti_type_index::type_info_t* const pTypeInfo;
const void * pCustomId_;
#if defined( BOOST_ENABLE_ASSERT_HANDLER ) || !defined( NDEBUG )
const std::type_info * pCustomIdType_;
Expand All @@ -41,8 +45,14 @@ struct id_holder
};

template< class MostDerived >
id_provider id_holder< MostDerived >::idProvider_;
id_provider id_holder< MostDerived >::idProvider_ =
{
&boost::typeindex::ctti_type_index::type_id< MostDerived >().type_info(),
0,
0
};

#endif // !defined(BOOST_STATECHART_USE_NATIVE_RTTI)


//////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -76,8 +86,8 @@ struct rtti_policy

typedef bool id_provider_type; // dummy
#else
typedef const void * id_type;
typedef const id_provider * id_provider_type;
typedef boost::typeindex::ctti_type_index id_type;
typedef const id_provider* id_provider_type;
#endif

////////////////////////////////////////////////////////////////////////////
Expand All @@ -93,7 +103,7 @@ struct rtti_policy
#ifdef BOOST_STATECHART_USE_NATIVE_RTTI
return id_type( typeid( *this ) );
#else
return idProvider_;
return id_type( *idProvider_->pTypeInfo );
#endif
}

Expand All @@ -112,25 +122,13 @@ struct rtti_policy
#ifdef BOOST_STATECHART_USE_NATIVE_RTTI
rtti_base_type( id_provider_type ) {}

////////////////////////////////////////////////////////////////////////
#if BOOST_WORKAROUND( __GNUC__, BOOST_TESTED_AT( 4 ) )
// We make the destructor virtual for GCC because with this compiler
// there is currently no way to disable the "has virtual functions but
// non-virtual destructor" warning on a class by class basis. Although
// it can be done on the compiler command line with
// -Wno-non-virtual-dtor, this is undesirable as this would also
// suppress legitimate warnings for types that are not states.
virtual ~rtti_base_type() {}
#else
~rtti_base_type() {}
#endif

private:
////////////////////////////////////////////////////////////////////////
// For typeid( *this ) to return a value that corresponds to the most-
// derived type, we need to have a vptr. Since this type does not
// contain any virtual functions we need to artificially declare one so.
virtual void dummy() {}
// A virtual destructor will do.
virtual ~rtti_base_type() {}

#else
rtti_base_type(
id_provider_type idProvider
Expand Down Expand Up @@ -158,7 +156,7 @@ struct rtti_policy
#ifdef BOOST_STATECHART_USE_NATIVE_RTTI
return id_type( typeid( const MostDerived ) );
#else
return &id_holder< MostDerived >::idProvider_;
return boost::typeindex::ctti_type_index::type_id< MostDerived >();
#endif
}

Expand Down Expand Up @@ -204,5 +202,4 @@ struct rtti_policy
} // namespace boost



#endif