summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-09-30 11:13:47 +0200
committerAndras Timar <andras.timar@collabora.com>2014-10-14 15:28:01 +0200
commit7d81a3c2690ee7e6e9ac1df47e7afeb9f98bd8e4 (patch)
tree0d1857f82d2507526c26a5c984dcfa5a7b9e8285 /avmedia
parent45c9fd73d5973cbe6278635b2ee82ac8c5b4dbb8 (diff)
fdo#84008: kill c++11 code from collada2gltf
... so older compliers can deal with it. Change-Id: I7ecfa37601cae2979a5285436596175d2ebe1fe4 Reviewed-on: https://gerrit.libreoffice.org/11706 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/modeltools.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx
index 8c4251e32041..872e00aa1b14 100644
--- a/avmedia/source/framework/modeltools.cxx
+++ b/avmedia/source/framework/modeltools.cxx
@@ -28,6 +28,7 @@
#include <boost/property_tree/json_parser.hpp>
#include <boost/foreach.hpp>
#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
#include <config_features.h>
@@ -85,7 +86,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
// remove .tmp extension
sOutput = sOutput.copy(0, sOutput.getLength()-4);
- std::shared_ptr <GLTF::GLTFAsset> asset(new GLTF::GLTFAsset());
+ boost::shared_ptr <GLTF::GLTFAsset> asset(new GLTF::GLTFAsset());
asset->setBundleOutputPath(OUStringToOString( sOutput, RTL_TEXTENCODING_UTF8 ).getStr());
// If *.dae file is not in the local file system, then copy it to a temp folder for the conversion