diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:49:10 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 11:49:10 +0000 |
commit | d52e22f6da5d7d7700b554f8d8b06c26569e06fd (patch) | |
tree | 31a8b1a8fe5ca45b2d18be6425d148937f07fc56 /configmgr/source | |
parent | 4755ef217898060fa0493d301302bb08874b3a6c (diff) |
INTEGRATION: CWS obo05 (1.8.46); FILE MERGED
2006/06/07 12:34:29 obo 1.8.46.1: #i53611# port for .net 2005
Diffstat (limited to 'configmgr/source')
-rw-r--r-- | configmgr/source/inc/nodechangeinfo.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configmgr/source/inc/nodechangeinfo.hxx b/configmgr/source/inc/nodechangeinfo.hxx index 29abc59f7e08..7b5bf2040357 100644 --- a/configmgr/source/inc/nodechangeinfo.hxx +++ b/configmgr/source/inc/nodechangeinfo.hxx @@ -4,9 +4,9 @@ * * $RCSfile: nodechangeinfo.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-08 03:51:50 $ + * last change: $Author: vg $ $Date: 2006-09-25 12:49:10 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -267,6 +267,7 @@ namespace configmgr } } +#if !defined(WNT) || (defined(WNT) && _MSC_VER < 1400) namespace std { template <> @@ -274,5 +275,6 @@ namespace std void swap(configmgr::configuration::NodeChangesInformation& lhs, configmgr::configuration::NodeChangesInformation& rhs) { lhs.swap(rhs); } } +#endif #endif // CONFIGMGR_CONFIGCHANGEINFO_HXX_ |