diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:48:57 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:48:57 +0000 |
| commit | 4755ef217898060fa0493d301302bb08874b3a6c (patch) | |
| tree | 3d104dcee655aecd237cf7c2b2111df90c607ae1 /configmgr | |
| parent | 11d6878fdcadd28e4e8473fbefeaa70a28c2d53e (diff) | |
INTEGRATION: CWS obo05 (1.24.2); FILE MERGED
2006/09/11 14:25:25 obo 1.24.2.2: change for MSC only
2006/07/03 14:35:10 obo 1.24.2.1: #i53611# disable warning C4350
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/inc/change.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configmgr/source/inc/change.hxx b/configmgr/source/inc/change.hxx index 4c06d45883ee..439dfbaa7eda 100644 --- a/configmgr/source/inc/change.hxx +++ b/configmgr/source/inc/change.hxx @@ -4,9 +4,9 @@ * * $RCSfile: change.hxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: hr $ $Date: 2006-06-19 23:23:48 $ + * last change: $Author: vg $ $Date: 2006-09-25 12:48:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,6 +35,9 @@ #ifndef CONFIGMGR_CHANGE_HXX #define CONFIGMGR_CHANGE_HXX +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable : 4350) // behavior change: 'member1' called instead of 'member2' +#endif #ifndef _CONFIGMGR_TREE_VALUENODE_HXX #include "valuenode.hxx" |