diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:13:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:38:33 +0100 |
| commit | 0cee740c95496210d62206a21e8bc9adebf4fa4d (patch) | |
| tree | 4a1ff295046962418b30ac244314dfee5fb92fb5 /slideshow/source/inc/tools.hxx | |
| parent | b170265a6bba70faf1cb4172834586f4f45dd2bf (diff) | |
replace #ifdef SOLARIS with #ifdef __sun
Check for a macro that is defined by the compiler, we don't really need
one defined by the build system.
Change-Id: Iccb8e3198396881395c97a6b81690ebe64b7e9d2
Diffstat (limited to 'slideshow/source/inc/tools.hxx')
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index bb50d8a7ae3e..039db8339d58 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -294,7 +294,7 @@ namespace slideshow /// To work around ternary operator in initializer lists /// (Solaris compiler problems) -#ifdef SOLARIS +#ifdef __sun template <typename T> inline T const & ternary_op( const bool cond, T const & arg1, T const & arg2 ) |