vcl/aqua/source/a11y/aqua11ywrapper.mm | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit d626fa2e5892a8a166b5aec49e9cb5bfc2cf18c5
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 16 16:29:40 2013 +0300
Fix build breakage for 64-bit where NSPoint == CGPoint
Change-Id: I2dc86331cd1ddf3a9b9ea28dcd881d23789d60d6
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index e5dde15..8de6f5c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -62,10 +62,16 @@ static std::ostream &operator<<(std::ostream &s, NSObject
*obj) {
return s << [[obj description] UTF8String];
}
+#ifndef _LP64
+
+// In 64-bit code NSPoint == CGPoint, and CGPoint already has
+// an operator<< in vcl/inc/quartz/util.h
+
static std::ostream &operator<<(std::ostream &s, NSPoint point) {
return s << NSStringFromPoint(point);
}
+#endif
@implementation AquaA11yWrapper : NSView
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
