| commit | e18b4d30e4426d766730c2a3b24544f7df373aa5 | [log] [tgz] |
|---|---|---|
| author | Jose Dapena Paz <[email protected]> | Mon Apr 08 20:59:34 2019 |
| committer | Commit Bot <[email protected]> | Mon Apr 08 20:59:34 2019 |
| tree | f2e158fe8660753bc3cb03d6afd37ec9d5ec9db4 | |
| parent | 578c7a852a4ecd586d46c6ba42ef8c77430d435e [diff] [blame] |
sql: fix GCC build after introducing enum class sql::ColumnType GCC complains about symbol clash between enum class sql::ColumnType and method Statement::ColumnType. To avoid this, rename the method to Statement::GetColumnType. BUG=chromium:819294 Change-Id: Ic49ba2233ba062be958478c6f659e6b72276457a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1553320 Commit-Queue: José Dapena Paz <[email protected]> Reviewed-by: Scott Violet <[email protected]> Reviewed-by: Victor Costan <[email protected]> Reviewed-by: Ben Wells <[email protected]> Cr-Commit-Position: refs/heads/master@{#648859}
diff --git a/sql/statement.h b/sql/statement.h index 0f9202d4..54e87e37 100644 --- a/sql/statement.h +++ b/sql/statement.h
@@ -124,7 +124,7 @@ // "type conversion." This means requesting the value of a column of a type // where that type is not the native type. For safety, call ColumnType only // on a column before getting the value out in any way. - ColumnType ColumnType(int col) const; + ColumnType GetColumnType(int col) const; // These all take a 0-based argument index. bool ColumnBool(int col) const;