sc/inc/stlalgorithm.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e83598ae9e55e5f3fd21faa296f0e81df1ddca4b
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Wed Mar 5 13:58:56 2014 -0500
Build fix on Windows.
Change-Id: Icbd46d5bc72bdc07490dd45b3d29a4400a66119f
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index d2beaa6..5cc22f2 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -80,9 +80,9 @@ public:
size_type size = n*sizeof(value_type);
#ifdef WNT
- return _aligned_malloc(size, _Alignment);
+ return (pointer)_aligned_malloc(size, _Alignment);
#elif defined __ANDROID__
- return memalign(_Alignment, size);
+ return (pointer)memalign(_Alignment, size);
#else
void* ptr;
int err = posix_memalign(&ptr, _Alignment, size);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
