diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-08 08:12:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-09 11:14:59 +0000 |
| commit | 3a4d9d34e80c6161dd3809c69fdb1dba740a4a19 (patch) | |
| tree | 328ff07ea337906cebcdf8b2eb64fb99c33fc8d0 /include/vcl | |
| parent | 98a61f5b8da500fcefd2e7f0dfb1231bfb87f2fb (diff) | |
Workaround seems no longer necessary for MSVC 2013
Moreover, the removed code doesn't compile on MSVC 2015.
Change-Id: I400df7b7934a8965a204009328d44e74f220fc37
Reviewed-on: https://gerrit.libreoffice.org/16805
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/vclptr.hxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index 79c784f23625..b18872453ca0 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -46,21 +46,12 @@ private: struct S { char c[2]; }; -#if defined _MSC_VER - static char f(T2 *, long); - static S f(T1 * const &, int); -#else template< typename U > static char f(T2 *, U); static S f(T1 *, int); -#endif struct H { H(); // avoid C2514 "class has no constructors" from MSVC 2008 -#if defined _MSC_VER - operator T1 * const & () const; -#else operator T1 * () const; -#endif operator T2 * (); }; |