include/vcl/vclptr.hxx | 9 ---------
1 file changed, 9 deletions(-)
New commits:
commit 3a4d9d34e80c6161dd3809c69fdb1dba740a4a19
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Wed Jul 8 08:12:11 2015 +0200
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 <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 79c784f..b188724 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 * ();
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
