diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:15:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-17 16:38:34 +0100 |
| commit | 6574aa57db96938248388c470d4061eca70bfa2e (patch) | |
| tree | 37414bd9259ed8df1f367c535ecc8e8bd5f82af3 | |
| parent | 0cee740c95496210d62206a21e8bc9adebf4fa4d (diff) | |
remove SunStudio hacks
There is no "SOLARIS compiler".
Change-Id: Idcfaee36307b1a4112f7fd6702c5f0e528f812c8
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 14 | ||||
| -rw-r--r-- | svx/source/sdr/event/eventhandler.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sdr/overlay/overlayobjectlist.cxx | 2 |
3 files changed, 0 insertions, 18 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, diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index ae55c9e0506d..9511c623a1a2 100644 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx @@ -19,8 +19,6 @@ #include "eventhandler.hxx" -// for SOLARIS compiler include of algorithm part of _STL is necessary to -// get access to basic algos like ::std::find #include <algorithm> #include <tools/debug.hxx> diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index 6438bc762115..32ed7dbc1018 100644 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx @@ -24,8 +24,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/gen.hxx> -// for SOLARIS compiler include of algorithm part of _STL is necessary to -// get access to basic algos like ::std::find #include <algorithm> #include <drawinglayer/processor2d/hittestprocessor2d.hxx> |