Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Michael Meeks
Hi Miklos, On Thu, 2010-11-25 at 11:17 +0100, Miklos Vajna wrote: > OK - I'm attaching an updated patch, containing the license. Looks great to me; lets get it in ! :-) Thanks, Michael. -- michael.me...@novell.com <><, Pseudo Engineer, itinerant idiot _

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Miklos Vajna
On Thu, Nov 25, 2010 at 03:33:08AM -0700, Tor Lillqvist wrote: > Sure, although I think I would prefer to keep OSL_THIS_FUNC as "" > instead of "(unknown)" in the fallback case. OK, I just changed that and pushed it. > So, you think the i#114290 argument that neither __PRETTY_FUNCTION__ > nor _

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Tor Lillqvist
> Tor was exercised about this at one stage IIRC, does the above work for you ? Sure, although I think I would prefer to keep OSL_THIS_FUNC as "" instead of "(unknown)" in the fallback case. Also, we need to find out if there really is no __func__ or similar even in MSVC2010. So, you think the

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Miklos Vajna
On Thu, Nov 25, 2010 at 10:11:40AM +, Michael Meeks wrote: > Looks great to me; if we took this chunk of code from boost though - we > should include the relevant boost license header and copyright statement > at the end of that file, and separate out the section it applies to > IMHO.

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Michael Meeks
Hi Miklos, On Wed, 2010-11-24 at 16:08 +0100, Miklos Vajna wrote: > Both are just removing the __PRETTY_FUNCTION__ / etc expressions, which > is not that good, I think. :-) > The attached patch tries to solve both problems, and of course > build-tested. > Does it look sane - may i push i

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Miklos Vajna
On Thu, Nov 25, 2010 at 10:51:05AM +0100, Sebastian Spaeth wrote: > On Thu, 25 Nov 2010 10:47:22 +0100, Sebastian Spaeth wrote: > > > +#define OSL_LOG_PREFIX (OSL_THIS_FILE, ":", OSL_THIS_FUNC, ":", > > > OSL_MACRO_VALUE_TO_STRING( __LINE__ ), "; ") > > > > On OOo there is a bug open to remove

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Sebastian Spaeth
On Thu, 25 Nov 2010 10:47:22 +0100, Sebastian Spaeth wrote: > > +#define OSL_LOG_PREFIX (OSL_THIS_FILE, ":", OSL_THIS_FUNC, ":", > > OSL_MACRO_VALUE_TO_STRING( __LINE__ ), "; ") > > On OOo there is a bug open to remove OSL_THIS_FUNC (or was it an Easy > Hack) as it is not doing anyway what it is

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Sebastian Spaeth
On Thu, 21 Oct 2010 09:40:53 +0200, Thomas Klausner wrote: > -#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" > OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; " > +#define OSL_LOG_PREFIX (OSL_THIS_FILE, ":", OSL_THIS_FUNC, ":", > OSL_MACRO_VALUE_TO_STRING( __LINE__ ), "; ") On OOo there is

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-25 Thread Caolán McNamara
On Wed, 2010-11-24 at 16:08 +0100, Miklos Vajna wrote: > 1) Need to use different exrepssions based on compiler. This is what > boost/current_function.hpp does, but it's C++ and diagnose.h is used in > C code as well. Pity that boost stuffed it in under the c++ namespace directives, otherwise coul

Re: [Libreoffice] ucb/source/ucb compilation error

2010-11-24 Thread Miklos Vajna
Hi, I would like to revisit this topic. So far what we have is: - our change: http://cgit.freedesktop.org/libreoffice/ure/commit/?id=311cae41f2f94f00f4a417ad2ac9f07e1ce37ea7 - OOo change: http://hg.services.openoffice.org/cws/sb132/rev/c3a67e297108 Both are just removing the __PRETTY_FUNCT

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-25 Thread Thomas Klausner
On Fri, Oct 22, 2010 at 09:40:34AM -0400, Kevin Hunter wrote: > Have you enumerated everywhere this is used (in the code base). At > the moment, I'm having a difficult time seeing the use (both > logically and usefully) of a macro that defines a single space. At > the point you're basically castr

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-22 Thread Kevin Hunter
At 8:08am -0400 Fri, 22 Oct 2010, Thomas Klausner wrote: On Thu, Oct 21, 2010 at 05:16:32PM +0200, Thomas Klausner wrote: I'll switch diagnose.h (locally) to give " " for OSL_THIS_FUNC, as it currently seems to do for everyone else. To close this thread: I've pushed this change. Have you enu

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-22 Thread Thomas Klausner
On Thu, Oct 21, 2010 at 05:16:32PM +0200, Thomas Klausner wrote: > I'll switch diagnose.h (locally) to give " " for OSL_THIS_FUNC, as it > currently seems to do for everyone else. To close this thread: I've pushed this change. Thomas ___ LibreOffice mai

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Thomas Klausner
On Thu, Oct 21, 2010 at 04:08:16AM -0600, Tor Lillqvist wrote: > By the way, note that the OSL_THIS_FUNC currently is quite broken. (Unless > somebody has fixed it recently in the LibreOffice repo.) See > http://www.openoffice.org/issues/show_bug.cgi?id=114290 , fixing it is > trivialish (an Eas

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Kevin Hunter
At 8:17am -0400 Thu, 21 Oct 2010, Thomas Klausner wrote: I don't imagine we're much interested in gcc2 nowadays Tangentially, does this imply that there should be a check, preprocessor or otherwise, that says, "You're using a compiler older that X.Y.Z. LiberOffice needs at least A.B.C" o

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Thomas Klausner
On Thu, Oct 21, 2010 at 10:12:24AM +0100, Michael Meeks wrote: > /* the macro OSL_LOG_PREFIX is intended to be an office internal macro > for now */ > -#define OSL_LOG_PREFIX OSL_THIS_FILE ":" OSL_THIS_FUNC ":" > OSL_MACRO_VALUE_TO_STRING( __LINE__ ) "; " > +#define OSL_LOG_PREFIX (OSL_THIS_FILE,

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Tor Lillqvist
By the way, note that the OSL_THIS_FUNC currently is quite broken. (Unless somebody has fixed it recently in the LibreOffice repo.) See http://www.openoffice.org/issues/show_bug.cgi?id=114290 , fixing it is trivialish (an EasyHack?, yeah, I need to add it there). --tml ___

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Michael Meeks
Hi guys, On Thu, 2010-10-21 at 09:40 +0200, Thomas Klausner wrote: > The attached patch makes compilation for this file work for me. I > still haven't finished a complete build, so I hope it doesn't trip up > somewhere else. Could someone please test it on a complete build? /* the macro OSL_LOG_

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-21 Thread Thomas Klausner
On Thu, Oct 21, 2010 at 01:11:22AM -0400, Kevin Hunter wrote: > The clue that it's not a macro (aside from reading the > documentation) is that it does not get processed out by the -E flag > to g++. Thus, the trip up is that it can't be concatenated as if it > were an inline string. See the attac

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-20 Thread Norbert Thiebaud
The first thing I'd check is : Is IllegalIdentifierException defined in this context ?, try adding ucb:: in front of it, if that doesn't work then try adding #include "com/sun/start/ucb/IllegalIdentifierException.hpp" Norbert On Thu, Oct 21, 2010 at 12:11 AM, Kevin Hunter wrote: > On 10/20/201

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-20 Thread Kevin Hunter
At 1:11am -0400 Thu, 21 Oct 2010, Kevin Hunter wrote: 3. Misinterpretation of __PRETTY_FUNCTION__? What is __PRETTY_FUNCTION__? It changed in GCC 3.4, I believe. Now, contrary to the implicit understanding from its all caps nature, it is *not* a macr

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-20 Thread Kevin Hunter
On 10/20/2010 04:58 PM, Thomas Klausner wrote: On Tue, Oct 19, 2010 at 02:44:17PM +0200, Thomas Klausner wrote: With up-to-date git, I now see: /build/libreoffice-3.2.99.2/ucb/source/ucp/file/prov.cxx: In member function 'virtual com::sun::star::uno::Reference fileaccess::FileProvider::qu

Re: [Libreoffice] ucb/source/ucb compilation error

2010-10-20 Thread Thomas Klausner
On Tue, Oct 19, 2010 at 02:44:17PM +0200, Thomas Klausner wrote: > With up-to-date git, I now see: > /build/libreoffice-3.2.99.2/ucb/source/ucp/file/prov.cxx: In member > function 'virtual > com::sun::star::uno::Reference > fileaccess::FileProvider::queryContent(const > com::sun::star::uno:

[Libreoffice] ucb/source/ucb compilation error

2010-10-19 Thread Thomas Klausner
Hi! With up-to-date git, I now see: /build/libreoffice-3.2.99.2/ucb/source/ucp/file/prov.cxx: In member function 'virtual com::sun::star::uno::Reference fileaccess::FileProvider::queryContent(const com::sun::star::uno::Reference&)': /build/libreoffice-3.2.99.2/ucb/source/ucp/file/prov.c