summaryrefslogtreecommitdiff
path: root/include/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-06 18:24:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-06 18:41:42 +0100
commitf1359d1221b335c4856821948f89868f021135eb (patch)
tree7739703036994becc0ffc5ab0f4f2f1cad6a7888 /include/sal
parent3e79e6584453cb211f75d36a076b588e32f5e980 (diff)
Make OUStringLiteral more useful
...don't dare make it non-explicit, yet. Along the way, introduce SAL_CONSTEXPR. Change-Id: Ia3179d0d5e001fd7aa92237c97437e9b74366ee1
Diffstat (limited to 'include/sal')
-rw-r--r--include/sal/types.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/sal/types.h b/include/sal/types.h
index 3d75f67ff920..8810695b2819 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -427,6 +427,16 @@ namespace css = ::com::sun::star;
#define SAL_FINAL
#endif
+/** C++11 "constexpr" feature.
+
+ @since LibreOffice 4.5
+*/
+#if HAVE_CXX11_CONSTEXPR
+#define SAL_CONSTEXPR constexpr
+#else
+#define SAL_CONSTEXPR
+#endif
+
#endif /* __cplusplus */
#ifdef __cplusplus