From ddbabe7c05cb094a321d18e429bcd92491f20c5f Mon Sep 17 00:00:00 2001 From: mostynb Date: Mon, 5 Jan 2015 16:20:50 -0800 Subject: replace COMPILE_ASSERT with static_assert in sql/ BUG=442514 Review URL: https://codereview.chromium.org/825313002 Cr-Commit-Position: refs/heads/master@{#310006} --- sql/statement.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sql/statement.cc') diff --git a/sql/statement.cc b/sql/statement.cc index b3707c5..6dbd8d9 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(sqlite3_column_type(ref_->stmt(), col)); } -- cgit v1.1