Changeset 476:bc9f23700bec in finroc_core


Ignore:
Timestamp:
04.05.2020 23:32:09 (11 months ago)
Author:
Max Reichardt <mreichardt@…>
Branch:
14.08
Phase:
public
Message:

Replaces static assertion that causes compiler error in gcc 9.3 with a plain assertion

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tAnnotatable.h

    r362 r476  
    9191  void AddAnnotation(TAnnotation& ann) 
    9292  { 
    93 #ifndef __clang__ // clang does not like this assert: static_assert expression is not an integral constant expression 
    94     static_assert(static_cast<void*>(&ann) == &static_cast<tAnnotation&>(ann), "tAnnotation must be first parent class when using multiple inheritance"); 
    95 #endif 
     93    assert(static_cast<void*>(&ann) == &static_cast<tAnnotation&>(ann) && "tAnnotation must be first parent class when using multiple inheritance"); 
    9694    internal::tAnnotatableImplementation::AddAnnotation(ann, typeid(TAnnotation).name()); 
    9795  } 
Note: See TracChangeset for help on using the changeset viewer.