diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-13 16:09:25 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-13 16:21:04 +0100 |
| commit | 3d9f5c856a4a77503695e68ce013ebf859fcb212 (patch) | |
| tree | aaa75452b54542a52f746da9782ae6c3d2663453 /solenv/inc/unxgcc.mk | |
| parent | 131e5d35a4edb9f8875a197e8e0382c168834f70 (diff) | |
make OString work even with old gcc that has SFINAE broken
Since OString already has a ctor accepting const char*, I cannot
find out a way to distinguish string literals other than using
a template, otherwise const char* somehow takes precedence
(all of gcc, clang, msvc). But the template requires
the Substitution Is Not A Failure Idiom to actually create
only wanted instances. And the compiler can try evaluate
the OString ctor as a possibility when comparing an int to
an anonymous enum, and anonymous enum as a type without linkage
cannot be a template argument before C++11. SFINAE should still
work, but not with gcc older than 4.0.2 (which we right now
use only on macs). So for that case disable the string literal
ctors, which means macs will have one extra strlen call,
and also that embedded \0's in string literals will be
inconsistent. The tiny performance problem shouldn't matter that
much and will eventually go away, the \0 problem should not
matter, since before string literal ctors were introduced
\0's had not been included anyway unless RTL_CONSTASCII_STRINGPARAM
was used. So we should be safe and when removing the CONSTASCII
macros \0 cases should be handled by explicitly mentioning
the length.
Diffstat (limited to 'solenv/inc/unxgcc.mk')
| -rw-r--r-- | solenv/inc/unxgcc.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk index 3765b2dd6cea..8bfeebc20cf6 100644 --- a/solenv/inc/unxgcc.mk +++ b/solenv/inc/unxgcc.mk @@ -51,6 +51,10 @@ CDEFS+=-D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +.IF "$(HAVE_SFINAE_ANONYMOUS_BROKEN)" == "TRUE" +CDEFS += -DHAVE_SFINAE_ANONYMOUS_BROKEN +.ENDIF # "$(HAVE_SFINAE_ANONYMOUS_BROKEN)" == "TRUE" + # this is a platform with JAVA support .IF "$(SOLAR_JAVA)"!="" JAVADEF=-DSOLAR_JAVA |