diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:30:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:30:52 +0000 |
| commit | 45653fdf8f2b2d6f98b14e65a67774cd823ecd8e (patch) | |
| tree | f96221e56f212d8a40a0165b69159c94dccf1426 /configmgr/source/tree | |
| parent | 99308ce7cc97f30c92896870a478671ebb185437 (diff) | |
INTEGRATION: CWS warnings01 (1.4.4); FILE MERGED
2006/02/14 10:17:38 cd 1.4.4.1: #i55991# Fix warnings for ms c++ compiler
Diffstat (limited to 'configmgr/source/tree')
| -rw-r--r-- | configmgr/source/tree/valuenodeaccess.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configmgr/source/tree/valuenodeaccess.cxx b/configmgr/source/tree/valuenodeaccess.cxx index a972300653bd..9996d42163d4 100644 --- a/configmgr/source/tree/valuenodeaccess.cxx +++ b/configmgr/source/tree/valuenodeaccess.cxx @@ -4,9 +4,9 @@ * * $RCSfile: valuenodeaccess.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:21:19 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:30:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,7 +76,7 @@ void ValueNodeAccess::setValue(memory::UpdateAccessor & _aUpdater, NodeAddressTy sharable::ValueNode * node = accessValue(_aValueNode.m_pData,_aUpdater); using namespace sharable; - AnyData::TypeCode aType = node->info.type & Type::mask_valuetype; + AnyData::TypeCode aType = AnyData::TypeCode( node->info.type & Type::mask_valuetype ); // release old data if (node->info.flags & Flags::valueAvailable) @@ -102,7 +102,7 @@ void ValueNodeAccess::setValue(memory::UpdateAccessor & _aUpdater, NodeAddressTy OSL_ASSERT(Type::value_any == 0); OSL_ASSERT(aNewType != Type::value_any); - aType = aNewType & Type::mask_valuetype; + aType = AnyData::TypeCode( aNewType & Type::mask_valuetype ); node->info.type |= aType; } @@ -132,7 +132,7 @@ void ValueNodeAccess::setToDefault(memory::UpdateAccessor & _aUpdater, NodeAddre // release value data if (node->info.flags & Flags::valueAvailable) { - AnyData::TypeCode aType = node->info.type & Type::mask_valuetype; + AnyData::TypeCode aType = AnyData::TypeCode( node->info.type & Type::mask_valuetype ); OSL_ASSERT(aType != Type::value_any); freeData(_aUpdater.allocator(),aType,node->value); @@ -151,7 +151,7 @@ void ValueNodeAccess::changeDefault(memory::UpdateAccessor & _aUpdater, NodeAddr sharable::ValueNode * node = accessValue(_aValueNode.m_pData,_aUpdater); using namespace sharable; - AnyData::TypeCode aType = node->info.type & Type::mask_valuetype; + AnyData::TypeCode aType = AnyData::TypeCode( node->info.type & Type::mask_valuetype ); // release old data if (node->info.flags & Flags::defaultAvailable) @@ -177,7 +177,7 @@ void ValueNodeAccess::changeDefault(memory::UpdateAccessor & _aUpdater, NodeAddr OSL_ASSERT(Type::value_any == 0); OSL_ASSERT(aNewType != Type::value_any); - aType = aNewType & Type::mask_valuetype; + aType = AnyData::TypeCode( aNewType & Type::mask_valuetype ); node->info.type |= aType; } |