INTEGRATION: CWS pj71 (1.16.6); FILE MERGED

2007/01/12 13:41:22 thb 1.16.6.1: #i58976# Extended gcc4 workaround to all 4.1.x minors
This commit is contained in:
Vladimir Glazounov 2007-01-18 13:19:34 +00:00
parent 05be4b0041
commit 41818a1e98

View file

@ -4,9 +4,9 @@
*
* $RCSfile: textaction.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: vg $ $Date: 2006-11-22 11:08:35 $
* last change: $Author: vg $ $Date: 2007-01-18 14:19:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -2308,7 +2308,7 @@ namespace cppcanvas
}
}
#if defined __GNUC__
#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 2
#if __GNUC__ == 4 && __GNUC_MINOR__ == 1
// Unreachable; to avoid bogus warning:
return ActionSharedPtr();
#endif