summaryrefslogtreecommitdiffstats
path: root/base/containers
diff options
context:
space:
mode:
Diffstat (limited to 'base/containers')
-rw-r--r--base/containers/small_map.h2
-rw-r--r--base/containers/stack_container.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/containers/small_map.h b/base/containers/small_map.h
index df3d22a..8ae4219 100644
--- a/base/containers/small_map.h
+++ b/base/containers/small_map.h
@@ -187,7 +187,7 @@ class SmallMap {
// particular, gcc 2.95.3 does it but later versions allow 0-length
// arrays. Therefore, we explicitly reject non-positive kArraySize
// here.
- COMPILE_ASSERT(kArraySize > 0, default_initial_size_should_be_positive);
+ static_assert(kArraySize > 0, "default initial size should be positive");
public:
typedef typename NormalMap::key_type key_type;
diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h
index 54090d3..2c7dd65 100644
--- a/base/containers/stack_container.h
+++ b/base/containers/stack_container.h
@@ -57,7 +57,7 @@ class StackAllocator : public std::allocator<T> {
// buffer of the right size instead.
base::AlignedMemory<sizeof(T[stack_capacity]), ALIGNOF(T)> stack_buffer_;
#if defined(__GNUC__) && !defined(ARCH_CPU_X86_FAMILY)
- COMPILE_ASSERT(ALIGNOF(T) <= 16, crbug_115612);
+ static_assert(ALIGNOF(T) <= 16, "http://crbug.com/115612");
#endif
// Set when the stack buffer is used for an allocation. We do not track