solenv/gbuild/gbuild.mk | 1 +
ucbhelper/source/client/content.cxx | 4 ++++
2 files changed, 5 insertions(+)
New commits:
commit 9c0ba0ba41cb3b814cc8bf7a33abf1245d4b241e
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 3 23:51:32 2013 +0300
WaE: Unreachable code
This time noticed by the linker when doing link-time code generation (!).
Change-Id: I9600571bef2a8cc30b2e28dd52b01633bab55f32
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index aac47d4..850f56e 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1049,9 +1049,11 @@ sal_Bool Content::isFolder()
get() ) ),
m_xImpl->getEnvironment() );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
// Unreachable - cancelCommandExecution always throws an exception.
// But some compilers complain...
return sal_False;
+#endif
}
//=========================================================================
@@ -1070,9 +1072,11 @@ sal_Bool Content::isDocument()
get() ) ),
m_xImpl->getEnvironment() );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
// Unreachable - cancelCommandExecution always throws an exception,
// But some compilers complain...
return sal_False;
+#endif
}
//=========================================================================
commit 4775a2b0fb0f01caa1e56934ac26d898dcd0fb48
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Sep 3 23:50:03 2013 +0300
Make it possible to #ifdef on ENABLE_LTO
Change-Id: I849af224b6a34d1db21816cfe348d9319c2938ae
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1c5dcfa..9d5c1d7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,7 @@ gb_GLOBALDEFS += \
DISABLE_DYNLOADING \
DISABLE_EXPORT \
DISABLE_SCRIPTING \
+ ENABLE_LTO \
)
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
