diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-10-21 14:12:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-10-21 14:16:58 +0300 |
| commit | f6d351e5ec3809b53ca2c2dffbbebc465ee7848d (patch) | |
| tree | 72c5c501b02959df3caff67636d0625ae300a4d7 /ucbhelper | |
| parent | 25ae2ab38df3c914e9f836cf08120913bc2c4ba6 (diff) | |
Revert "Attempt workaround for possible bug in Apple's LLVM g++ 4.2.1"
We get more similar linking errors elsewhere anyway. We would need a
more generic fix. As for now, just apparently not possible to build
with the LLVM g++ from Xcode 4. Use g++-4.2 / gcc-4.2 if you want ot
use Xcode 4. But note that for Xcode 4.2, you might need to do:
ln -s i686-apple-darwin10 /Developer/SDKs/MacOSX10.6.sdk/usr/lib/gcc/i686-apple-darwin11
This reverts commit f3e10529134029a7853cdca925bc7091a639bc8a.
Diffstat (limited to 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/provider/contenthelper.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index 7d2dc10df748..ecc7ad24d1f9 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -795,18 +795,7 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent() } } -#if defined(__llvm__) && __GNUC__ == 4 && __GNUC_MINOR__ == 2 - // No idea if this works... but it compiles, links, and just - // "return xParent" causes an undefined symbol: - - // uno::Reference<uno::XInterface>::operator uno::Reference<uno::XInterface> const&() const - - // (com::sun::star:: omitted for brevity) - - return uno::Reference< uno::XInterface >(xParent); -#else return xParent; -#endif } //========================================================================= |