[Libreoffice-commits] core.git: avmedia/source
Tor Lillqvist
tml at collabora.com
Thu May 15 09:33:25 PDT 2014
avmedia/source/macavf/player.mm | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 2e6d79799bc616addc5c6359179326b8f493a5a7
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu May 15 19:31:18 2014 +0300
Use std::hash:map when building against libstdc++ (and not libc++)
Change-Id: I7873d99e5982170551ba0ff7b4f383af5935c25b
diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 751dbed..1e2c882 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -25,8 +25,13 @@
using namespace ::com::sun::star;
+#ifdef _LIBCPP_VERSION
#include <unordered_map>
typedef std::unordered_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;
+#else
+#include <hash_map>
+typedef std::hash_map<NSObject*,avmedia::macavf::MacAVObserverHandler*> HandlersForObject;
+#endif
@implementation MacAVObserverObject
{
More information about the Libreoffice-commits
mailing list