summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-01-17 16:15:07 +0100
committerMichael Stahl <mstahl@redhat.com>2017-01-17 16:38:34 +0100
commit6574aa57db96938248388c470d4061eca70bfa2e (patch)
tree37414bd9259ed8df1f367c535ecc8e8bd5f82af3 /slideshow
parent0cee740c95496210d62206a21e8bc9adebf4fa4d (diff)
remove SunStudio hacks
There is no "SOLARIS compiler". Change-Id: Idcfaee36307b1a4112f7fd6702c5f0e528f812c8
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/inc/tools.hxx14
1 files changed, 0 insertions, 14 deletions
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 039db8339d58..d1165a6754b2 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -292,20 +292,6 @@ namespace slideshow
return comphelper::rng::uniform_size_distribution(0, n-1);
}
- /// To work around ternary operator in initializer lists
- /// (Solaris compiler problems)
-#ifdef __sun
- template <typename T>
- inline T const & ternary_op(
- const bool cond, T const & arg1, T const & arg2 )
- {
- if (cond)
- return arg1;
- else
- return arg2;
- }
-#endif
-
template <typename ValueType>
inline bool getPropertyValue(
ValueType & rValue,