Merge branch 'constexpr_esm' into 'master'

Use a constexpr for esm cc See merge request OpenMW/openmw!849
4 years ago · 4a7147e222
parent b0c9f6167c 89f721fad3
commit 4a7147e222
1 changed files with 1 additions and 1 deletions
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@ -85,7 +85,7 @@ bool inline operator!= (const Position& left, const Position& right) noexcept
 template <int a, int b, int c, int d>
 struct FourCC
 {
-    static const unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
+    static constexpr unsigned int value = (((((d << 8) | c) << 8) | b) << 8) | a;
 };

 enum RecNameInts