[Libreoffice-commits] core.git: include/com

[Stephan Bergmann]

 include/com/sun/star/uno/Reference.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8468436bf65b05ab77c3414e6cd5d532c6aea1d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jul 6 15:24:44 2015 +0200

    Workaround seems no longer necessary for MSVC 2013
    
    ...but C2514 is still there
    
    Change-Id: I818fed066b0ddaf5c30e6057285151d8a575c373

diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index 91db7f5..a4bdf7c 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -181,7 +181,7 @@ private:
 
     struct S { char c[2]; };
 
-#if defined _MSC_VER
+#if defined _MSC_VER && _MSC_VER < 1800
     static char f(T2 *, long);
     static S f(T1 * const &, int);
 #else
@@ -190,8 +190,8 @@ private:
 #endif
 
     struct H {
-        H(); // avoid C2514 "class has no constructors" from MSVC 2008
-#if defined _MSC_VER
+        H(); // avoid C2514 "class has no constructors" from MSVC
+#if defined _MSC_VER && _MSC_VER < 1800
         operator T1 * const & () const;
 #else
         operator T1 * () const;