commit d4475816b67fa385e82c52ff7e1ef83cba98aa35
author Geoff Lang <geofflang@chromium.org> Wed Mar 18 10:53:05 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Mar 18 16:27:47 2015 +0000
tree 4d4bb33da4165c7d2a4cbe07b2fa47733409d731
parent fc1806e14df971d78ed72d2f936ff2f55cdba66a

Always use static_assert for compile-time assertions and remove META_ASSERT.

BUG=468139

Change-Id: I696ef307f2faa54bb72df66784bc79a055499987
Reviewed-on: https://chromium-review.googlesource.com/260776
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Config.cpp

diff --git a/src/libANGLE/Config.cpp b/src/libANGLE/Config.cpp
index e89a1c2..ceb53db 100644
--- a/src/libANGLE/Config.cpp
+++ b/src/libANGLE/Config.cpp
@@ -125,10 +125,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, "Unexpected EGL enum value.");
         SORT(configCaveat);
 
-        META_ASSERT(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER);
+        static_assert(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER, "Unexpected EGL enum value.");
         SORT(colorBufferType);
 
         // By larger total number of color bits, only considering those that are requested to be > 0.