Kaydet (Commit) e3883cc2 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Zolnai Tamás

collada2gltf: drop tr1 support

The detection code is wrong for gcc 4.6 and the tr1 code actually
conflicts with the OpenCOLLADA code, because it creates an ambiguity
of shared_ptr in the cpp files.

Additionally most of the headers already use std::shared_ptr or
std::unordered_map.

Change-Id: Ibfe80e45687d34ec6fcd23339fd3f968fae402ba
Reviewed-on: https://gerrit.libreoffice.org/11695Reviewed-by: 's avatarZolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: 's avatarZolnai Tamás <tamas.zolnai@collabora.com>
üst aa39d494
...@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ ...@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \ external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \
external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \ external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \
external/collada2gltf/patches/shader_compatibility.patch.1 \ external/collada2gltf/patches/shader_compatibility.patch.1 \
external/collada2gltf/patches/drop_tr1_support.patch.1 \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment