Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenscholl committed Oct 24, 2021
2 parents bed1d8e + e0a35b0 commit d92c646
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions esl/simulation/identity.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ namespace esl {
{
static_assert(
std::is_base_of<base_type_, identifiable_type_>::value
//#ifdef WITH_PYTON
#ifdef WITH_PYTON
|| std::is_base_of<boost::python::object, identifiable_type_>::value
//#endif
#endif
,
"can not cast identifier, please verify that this "
"conversion is allowed");
Expand Down

0 comments on commit d92c646

Please sign in to comment.