diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 15:53:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-13 19:58:40 +0200 |
| commit | d4a73d42557fab58fdab87304692062812ad5889 (patch) | |
| tree | c94f13658a03ea28deb3432256289ba75c4f471f /src/gui/rhi/qshaderdescription.cpp | |
| parent | d12afeff4097dd78f1311511e0c8f74e1a810d47 (diff) | |
Another round of using noexcept instead of pre-C++11 defines
A few new files were added with old-school defines.
Change-Id: Ieb2c71e094e55102f3f39fb9551823f36863f5f4
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/rhi/qshaderdescription.cpp')
| -rw-r--r-- | src/gui/rhi/qshaderdescription.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp index 2a999ebf4e..b20ed8b178 100644 --- a/src/gui/rhi/qshaderdescription.cpp +++ b/src/gui/rhi/qshaderdescription.cpp @@ -1223,7 +1223,7 @@ void QShaderDescriptionPrivate::loadFromStream(QDataStream *stream, int version) \relates QShaderDescription */ -bool operator==(const QShaderDescription &lhs, const QShaderDescription &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription &lhs, const QShaderDescription &rhs) noexcept { if (lhs.d == rhs.d) return true; @@ -1244,7 +1244,7 @@ bool operator==(const QShaderDescription &lhs, const QShaderDescription &rhs) Q_ \relates QShaderDescription::InOutVariable */ -bool operator==(const QShaderDescription::InOutVariable &lhs, const QShaderDescription::InOutVariable &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription::InOutVariable &lhs, const QShaderDescription::InOutVariable &rhs) noexcept { return lhs.name == rhs.name && lhs.type == rhs.type @@ -1262,7 +1262,7 @@ bool operator==(const QShaderDescription::InOutVariable &lhs, const QShaderDescr \relates QShaderDescription::BlockVariable */ -bool operator==(const QShaderDescription::BlockVariable &lhs, const QShaderDescription::BlockVariable &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription::BlockVariable &lhs, const QShaderDescription::BlockVariable &rhs) noexcept { return lhs.name == rhs.name && lhs.type == rhs.type @@ -1281,7 +1281,7 @@ bool operator==(const QShaderDescription::BlockVariable &lhs, const QShaderDescr \relates QShaderDescription::UniformBlock */ -bool operator==(const QShaderDescription::UniformBlock &lhs, const QShaderDescription::UniformBlock &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription::UniformBlock &lhs, const QShaderDescription::UniformBlock &rhs) noexcept { return lhs.blockName == rhs.blockName && lhs.structName == rhs.structName @@ -1297,7 +1297,7 @@ bool operator==(const QShaderDescription::UniformBlock &lhs, const QShaderDescri \relates QShaderDescription::PushConstantBlock */ -bool operator==(const QShaderDescription::PushConstantBlock &lhs, const QShaderDescription::PushConstantBlock &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription::PushConstantBlock &lhs, const QShaderDescription::PushConstantBlock &rhs) noexcept { return lhs.name == rhs.name && lhs.size == rhs.size @@ -1310,7 +1310,7 @@ bool operator==(const QShaderDescription::PushConstantBlock &lhs, const QShaderD \relates QShaderDescription::StorageBlock */ -bool operator==(const QShaderDescription::StorageBlock &lhs, const QShaderDescription::StorageBlock &rhs) Q_DECL_NOTHROW +bool operator==(const QShaderDescription::StorageBlock &lhs, const QShaderDescription::StorageBlock &rhs) noexcept { return lhs.blockName == rhs.blockName && lhs.instanceName == rhs.instanceName |