diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:14:36 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:14:36 +0000 |
commit | 795fd7a20fe395d703eb1f0f6df7bf9bf3fa6405 (patch) | |
tree | 1546a1d12c3569491098fb49bf581e20c5ddaccd /sal | |
parent | d7d1803310fbb9843a81a884e7c8050ff3650102 (diff) |
INTEGRATION: CWS obo05 (1.22.18); FILE MERGED
2006/06/28 11:54:44 obo 1.22.18.1: #i53611# .net 2005 warning 4738 off
Diffstat (limited to 'sal')
-rw-r--r-- | sal/rtl/source/ustring.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sal/rtl/source/ustring.c b/sal/rtl/source/ustring.c index d7ecdc47f7d3..4245e294ac2e 100644 --- a/sal/rtl/source/ustring.c +++ b/sal/rtl/source/ustring.c @@ -4,9 +4,9 @@ * * $RCSfile: ustring.c,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: rt $ $Date: 2006-05-04 15:15:15 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:14:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,6 +32,9 @@ * MA 02111-1307 USA * ************************************************************************/ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance +#endif #ifndef _RTL_MEMORY_H_ #include <rtl/memory.h> |