Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: client/simple_string_dictionary.cc

Issue 615923004: Convert COMPILE_ASSERT to static_assert (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: fixes Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | crashpad.doxy » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/simple_string_dictionary.cc
diff --git a/client/simple_string_dictionary.cc b/client/simple_string_dictionary.cc
index c8e9c98d64d7a7352a6540aa97b4f1f6749b43a5..171a85267a2a5a19c347553aa3267a2c8bb86d90 100644
--- a/client/simple_string_dictionary.cc
+++ b/client/simple_string_dictionary.cc
@@ -14,7 +14,6 @@
#include "client/simple_string_dictionary.h"
-#include "base/basictypes.h"
#include "util/stdlib/cxx.h"
#if CXX_LIBRARY_VERSION >= 2011
@@ -29,9 +28,9 @@ typedef TSimpleStringDictionary<1, 1, 1> SimpleStringDictionaryForAssertion;
#if CXX_LIBRARY_VERSION >= 2011
// In C++11, check that TSimpleStringDictionary has standard layout, which is
// what is actually important.
-COMPILE_ASSERT(
+static_assert(
std::is_standard_layout<SimpleStringDictionaryForAssertion>::value,
- SimpleStringDictionary_must_be_standard_layout);
+ "SimpleStringDictionary must be standard layout");
#else
// In C++98 (ISO 14882), section 9.5.1 says that a union cannot have a member
// with a non-trivial ctor, copy ctor, dtor, or assignment operator. Use this
« no previous file with comments | « no previous file | crashpad.doxy » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698