diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:49:38 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:49:38 +0000 |
| commit | 9193cf56aeb91cb90324fc2e907190feff0cf02a (patch) | |
| tree | 75827b6a9f38922db591261d7f7dba95303aa3a5 /configmgr/source/inc | |
| parent | e2334d1fc92e750d10f12008569546aaca07c6e4 (diff) | |
INTEGRATION: CWS obo05 (1.6.46); FILE MERGED
2006/09/11 14:25:26 obo 1.6.46.2: change for MSC only
2006/07/03 14:35:11 obo 1.6.46.1: #i53611# disable warning C4350
Diffstat (limited to 'configmgr/source/inc')
| -rw-r--r-- | configmgr/source/inc/utility.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configmgr/source/inc/utility.hxx b/configmgr/source/inc/utility.hxx index e852d31edcc8..2580587ff27d 100644 --- a/configmgr/source/inc/utility.hxx +++ b/configmgr/source/inc/utility.hxx @@ -4,9 +4,9 @@ * * $RCSfile: utility.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:01:52 $ + * last change: $Author: vg $ $Date: 2006-09-25 12:49:38 $ * * 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_UTILITY_HXX_ #define CONFIGMGR_UTILITY_HXX_ +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#pragma warning(disable : 4350) // behavior change: 'member1' called instead of 'member2' +#endif #ifndef _COM_SUN_STAR_UNO_RUNTIMEEXCEPTION_HPP_ #include <com/sun/star/uno/RuntimeException.hpp> @@ -103,4 +106,3 @@ namespace configmgr #endif // CONFIGMGR_UTILITY_HXX_ - |