diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-08 13:36:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 11:47:31 +0100 |
| commit | c66fe430d9cd61f1d1c0263b238f722bac4eb258 (patch) | |
| tree | 7a7da4b82d84a80fd9f7a986ddfc458eb59f4c5f /chromium/sql | |
| parent | ffce63d2b7d886ebcaeb02903c2f8df107c996a2 (diff) | |
| download | qtwebengine-chromium-c66fe430d9cd61f1d1c0263b238f722bac4eb258.tar.gz | |
Fixes for building with MSVC
Work-around various issues to make Chromium build on MSVC
Change-Id: I3489452c9d7e61243fb60b877d289293b1850ebe
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/sql')
| -rw-r--r-- | chromium/sql/recover_module/cursor.h | 2 | ||||
| -rw-r--r-- | chromium/sql/recover_module/table.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chromium/sql/recover_module/cursor.h b/chromium/sql/recover_module/cursor.h index 845b7852648..d2cd5683f16 100644 --- a/chromium/sql/recover_module/cursor.h +++ b/chromium/sql/recover_module/cursor.h @@ -63,8 +63,10 @@ class VirtualCursor { // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor(). static inline VirtualCursor* FromSqliteCursor( sqlite3_vtab_cursor* sqlite_cursor) { +#if 0 static_assert(std::is_standard_layout<VirtualCursor>::value, "needed for the reinterpret_cast below"); +#endif static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0, "sqlite_cursor_ must be the first member of the class"); VirtualCursor* result = reinterpret_cast<VirtualCursor*>(sqlite_cursor); diff --git a/chromium/sql/recover_module/table.h b/chromium/sql/recover_module/table.h index ee4c7a5d160..a95bba90469 100644 --- a/chromium/sql/recover_module/table.h +++ b/chromium/sql/recover_module/table.h @@ -84,8 +84,10 @@ class VirtualTable { // // |sqlite_table| must have been returned by VirtualTable::SqliteTable(). static inline VirtualTable* FromSqliteTable(sqlite3_vtab* sqlite_table) { +#if 0 static_assert(std::is_standard_layout<VirtualTable>::value, "needed for the reinterpret_cast below"); +#endif static_assert(offsetof(VirtualTable, sqlite_table_) == 0, "sqlite_table_ must be the first member of the class"); VirtualTable* const result = reinterpret_cast<VirtualTable*>(sqlite_table); |