| Index: chrome/installer/mini_installer/mini_string.h
|
| diff --git a/chrome/installer/mini_installer/mini_string.h b/chrome/installer/mini_installer/mini_string.h
|
| index 52833a8087b897905b21a6cf6cc8287cc00ddfd4..23e53dc2b1b6fdf3e5c54f457efe1df811d56ce0 100644
|
| --- a/chrome/installer/mini_installer/mini_string.h
|
| +++ b/chrome/installer/mini_installer/mini_string.h
|
| @@ -6,8 +6,15 @@
|
| #define CHROME_INSTALLER_MINI_INSTALLER_MINI_STRING_H_
|
|
|
| #ifndef COMPILE_ASSERT
|
| -// COMPILE_ASSERT macro borrowed from macros.h
|
| +// Some bots that build mini_installer don't know static_assert.
|
| +#if __cplusplus >= 201103L
|
| #define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg)
|
| +#else
|
| +template <bool>
|
| +struct CompileAssert {};
|
| +#define COMPILE_ASSERT(expr, msg) \
|
| + typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
|
| +#endif
|
| #endif
|
|
|
| namespace mini_installer {
|
|
|