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

Unified Diff: sql/statement.cc

Issue 825313002: replace COMPILE_ASSERT with static_assert in sql/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 11 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/statement.cc
diff --git a/sql/statement.cc b/sql/statement.cc
index b3707c53dd39ebb6d49c4ed4918625880852e122..6dbd8d9ca534eb2093cfd4e89064cc39f94b9c15 100644
--- a/sql/statement.cc
+++ b/sql/statement.cc
@@ -171,11 +171,11 @@ int Statement::ColumnCount() const {
ColType Statement::ColumnType(int col) const {
// Verify that our enum matches sqlite's values.
- COMPILE_ASSERT(COLUMN_TYPE_INTEGER == SQLITE_INTEGER, integer_no_match);
- COMPILE_ASSERT(COLUMN_TYPE_FLOAT == SQLITE_FLOAT, float_no_match);
- COMPILE_ASSERT(COLUMN_TYPE_TEXT == SQLITE_TEXT, integer_no_match);
- COMPILE_ASSERT(COLUMN_TYPE_BLOB == SQLITE_BLOB, blob_no_match);
- COMPILE_ASSERT(COLUMN_TYPE_NULL == SQLITE_NULL, null_no_match);
+ static_assert(COLUMN_TYPE_INTEGER == SQLITE_INTEGER, "integer no match");
+ static_assert(COLUMN_TYPE_FLOAT == SQLITE_FLOAT, "float no match");
+ static_assert(COLUMN_TYPE_TEXT == SQLITE_TEXT, "integer no match");
+ static_assert(COLUMN_TYPE_BLOB == SQLITE_BLOB, "blob no match");
+ static_assert(COLUMN_TYPE_NULL == SQLITE_NULL, "null no match");
return static_cast<ColType>(sqlite3_column_type(ref_->stmt(), col));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698