diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2016-03-02 23:29:35 -0800 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-03-03 16:01:30 +0000 |
commit | 35b0520dc2ccdd1cdfc46f9f1d8d24889e0a3a1d (patch) | |
tree | 2e6fd5a3394bb19fb41c47b95663236ea03ebb55 | |
parent | 190795b1f884620ba8b31d3998ac97107d4f4eb7 (diff) |
Fix build in C++98 mode: template typenames must not be local
qgltf.cpp:1990:38: error: template argument for ‘template<class Key, class T> class QHash’ uses local type ‘GltfExporter::exportTechniques(QJsonObject&, const QString&)::ProgramNames’
Change-Id: Ic747cc2ab45e4dc6bb70ffff143844dc7120e571
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r-- | tools/qgltf/qgltf.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/qgltf/qgltf.cpp b/tools/qgltf/qgltf.cpp index 9486070f8..43b8af532 100644 --- a/tools/qgltf/qgltf.cpp +++ b/tools/qgltf/qgltf.cpp @@ -1924,6 +1924,14 @@ void GltfExporter::exportParameter(QJsonObject &dst, const QVector<ProgramInfo:: } } +namespace { +struct ProgramNames +{ + QString name; + QString coreName; +}; +} + void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) { if (!opts.shaders) @@ -1981,12 +1989,6 @@ void GltfExporter::exportTechniques(QJsonObject &obj, const QString &basename) obj["shaders"] = shaders; QJsonObject programs; - struct ProgramNames - { - QString name; - QString coreName; - }; - QHash<ProgramInfo *, ProgramNames> programMap; foreach (ProgramInfo *prog, m_usedPrograms) { QJsonObject program; |