Changeset 476:bc9f23700bec in finroc_core

Timestamp:

04.05.2020 23:32:09 (4 years 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:

• tAnnotatable.h (modified) (1 diff)

tAnnotatable.h

@@ -91 +91 @@
   void AddAnnotation(TAnnotation& ann)
   {
-#ifndef __clang__ // clang does not like this assert: static_assert expression is not an integral constant expression
-    static_assert(static_cast<void*>(&ann) == &static_cast<tAnnotation&>(ann), "tAnnotation must be first parent class when using multiple inheritance");
-#endif
+    assert(static_cast<void*>(&ann) == &static_cast<tAnnotation&>(ann) && "tAnnotation must be first parent class when using multiple inheritance");
     internal::tAnnotatableImplementation::AddAnnotation(ann, typeid(TAnnotation).name());
   }