diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-06 15:24:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-06 15:24:44 +0200 |
| commit | 8468436bf65b05ab77c3414e6cd5d532c6aea1d6 (patch) | |
| tree | f81d01a0f479055ee625ebee911583f46b416921 /include/com | |
| parent | 032c0ec6b18718dc2bde580ced9781048a2fdbb9 (diff) | |
Workaround seems no longer necessary for MSVC 2013
...but C2514 is still there
Change-Id: I818fed066b0ddaf5c30e6057285151d8a575c373
Diffstat (limited to 'include/com')
| -rw-r--r-- | include/com/sun/star/uno/Reference.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h index 91db7f59cb65..a4bdf7c6fbba 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; |