summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@qt.io>2022-01-24 14:38:29 +0100
committerMarco Bubke <marco.bubke@qt.io>2022-01-25 09:22:00 +0000
commitb3e9f24ed1c0d3c0ee4917d4b449da90e00e888a (patch)
treeb7e13f2e64ab6ec516a7ae8f3db35871c995bfa8
parente05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f (diff)
downloadqt-creator-b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a.tar.gz
QmlDesigner: Fix 32 bit
Because std::ptrdiff_t and int are the same under 32 bit the constructor is changed to a template. The class is private so it is very unlikely that it leads to errors. Task-number: QTCREATORBUG-26910 Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Christophe Giboudeaux <christophe@krop.fr> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--src/plugins/qmldesigner/designercore/projectstorage/storagecache.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
index 747c3d9a07..27d2905e8e 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
@@ -67,15 +67,8 @@ class StorageCache
StorageCacheIndex(const char *) = delete;
- constexpr explicit StorageCacheIndex(int id) noexcept
- : id{id}
- {}
-
- constexpr explicit StorageCacheIndex(std::size_t id) noexcept
- : id{static_cast<int>(id)}
- {}
-
- constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
+ template<typename IntegerType>
+ constexpr explicit StorageCacheIndex(IntegerType id) noexcept
: id{static_cast<int>(id)}
{}