Skip to content

Commit 5a42db3

Browse files
committed
Merge branch 'static_assert' into 'master'
Use static_assert for compile time check See merge request OpenMW/openmw!4637
2 parents 87d77a6 + 042c4b2 commit 5a42db3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

apps/openmw/mwworld/containerstore.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,7 @@ namespace MWWorld
406406
template <class T>
407407
ContainerStoreIteratorBase(const ContainerStoreIteratorBase<T>& other)
408408
{
409-
char CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR[IsConvertible<T, PtrType, void>::value ? 1 : -1];
410-
((void)CANNOT_CONVERT_CONST_ITERATOR_TO_ITERATOR);
409+
static_assert(IsConvertible<T, PtrType, void>::value);
411410
copy(other);
412411
}
413412

0 commit comments

Comments
 (0)