Use static_assert instead of meta macros. Change-Id: Id1e3a50d56475c495a3cfb82553c5bd4c48a0fc3 Reviewed-on: https://swiftshader-review.googlesource.com/5425 Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/Config.cpp b/src/OpenGL/libEGL/Config.cpp index 9a5839e..835b198 100644 --- a/src/OpenGL/libEGL/Config.cpp +++ b/src/OpenGL/libEGL/Config.cpp
@@ -211,10 +211,10 @@ return x.attribute < y.attribute; \ } - META_ASSERT(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG); + static_assert(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG, ""); SORT_SMALLER(mConfigCaveat); - META_ASSERT(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER); + static_assert(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER, ""); SORT_SMALLER(mColorBufferType); SORT_SMALLER(mRedSize); @@ -300,10 +300,10 @@ return x->attribute < y->attribute; \ } - META_ASSERT(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG); + static_assert(EGL_NONE < EGL_SLOW_CONFIG && EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG, ""); SORT_SMALLER(mConfigCaveat); - META_ASSERT(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER); + static_assert(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER, ""); SORT_SMALLER(mColorBufferType); // By larger total number of color bits, only considering those that are requested to be > 0.