From 7e6737cc865d9f0ba44a88b4be0c8460325d7b84 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 10 Nov 2008 15:06:12 +0000 Subject: CWS-TOOLING: integrate CWS cmcfixes50 2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info 2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings 2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed 2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const 2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous 2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces 2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous 2008-11-04 10:53:46 +0100 cmc r263311 : --- idl/source/cmptools/hash.cxx | 4 ++-- idl/source/objects/basobj.cxx | 8 ++++---- idl/source/objects/bastype.cxx | 2 +- idl/source/objects/module.cxx | 4 ++-- idl/source/objects/object.cxx | 8 ++++---- idl/source/objects/types.cxx | 42 +++++++++++++++++++++--------------------- idl/source/prj/database.cxx | 6 +++--- 7 files changed, 37 insertions(+), 37 deletions(-) (limited to 'idl') diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index d479914d29ca..1cfec1266978 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -122,7 +122,7 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert, if( bInsert ) { - DBG_ASSERT( nMax != nLoop, "Hash table full" ) + DBG_ASSERT( nMax != nLoop, "Hash table full" ); if( nMax != nLoop ) { nFill++; @@ -177,7 +177,7 @@ SvStringHashTable::~SvStringHashTable() #ifdef DBG_UTIL while( pPos != pEnd ) { - DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" ) + DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" ); pPos++; } #endif diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 10b696960e6a..c3a430acaa63 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -207,7 +207,7 @@ void SvMetaName::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aName; @@ -570,7 +570,7 @@ void SvMetaReference::Load( SvPersistStream & rStm ) if( nMask >= 0x2 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) @@ -620,7 +620,7 @@ void SvMetaExtern::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> pModule; @@ -656,7 +656,7 @@ void SvMetaExtern::Save( SvPersistStream & rStm ) *************************************************************************/ SvMetaModule * SvMetaExtern::GetModule() const { - DBG_ASSERT( pModule != NULL, "module not set" ) + DBG_ASSERT( pModule != NULL, "module not set" ); return pModule; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index cfc30f37ad3c..d9801a060291 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -140,7 +140,7 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) if( n & ~0x03 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ) + DBG_ERROR( "format error" ); } return rStm; } diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 9c9b517e5fc2..47af2b780cb6 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -87,7 +87,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) USHORT nVer; rStm >> nVer; // Version - DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" ) + DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" ); rStm >> aClassList; rStm >> aTypeList; @@ -103,7 +103,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm >> nCmpLen; #ifdef IDL_COMPILER DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER, - "no idl compiler format" ) + "no idl compiler format" ); rStm >> aBeginName; rStm >> aEndName; rStm >> aNextName; diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 8bda41f452e8..68b07c9206a4 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -65,7 +65,7 @@ void SvClassElement::Load( SvPersistStream & rStm ) if( nMask >= 0x08 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aAutomation; @@ -124,7 +124,7 @@ void SvMetaClass::Load( SvPersistStream & rStm ) if( nMask >= 0x20 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aAttrList; @@ -597,7 +597,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm, { case WRITE_ODL: { - DBG_ERROR( "Not supported anymore!" ) + DBG_ERROR( "Not supported anymore!" ); /* // Schreibt die Attribute SvMetaName::Write( rBase, rOutStm, nTab, nT, nA ); @@ -635,7 +635,7 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm, case WRITE_C_SOURCE: case WRITE_C_HEADER: { - DBG_ERROR( "Not supported anymore!" ) + DBG_ERROR( "Not supported anymore!" ); /* StringList aSuperList; if( nT == WRITE_C_SOURCE ) diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index ac98e38db8e3..0398912ee0fc 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -229,7 +229,7 @@ BOOL SvMetaAttribute::GetReadOnlyDoc() const BOOL SvMetaAttribute::IsMethod() const { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); return pType->GetType() == TYPE_METHOD; } @@ -253,7 +253,7 @@ ByteString SvMetaAttribute::GetMangleName( BOOL ) const void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); if( !nSbxFlags ) { // Flags koennen vom Aufrufer ueberschrieben werden if( pType->GetOut() ) @@ -266,7 +266,7 @@ void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags ) nSbxFlags |= SBX_READ; } SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) { const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList(); @@ -296,9 +296,9 @@ void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase, if( bVariable && IsVariable() ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) { @@ -522,9 +522,9 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase, WriteType nT ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( nT == WRITE_ODL || nT == WRITE_DOCU || nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE ) @@ -797,9 +797,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, bVariable = IsVariable(); SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); int nBType = pBaseType->GetType(); if( nT == WRITE_ODL ) @@ -976,9 +976,9 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, ULONG SvMetaAttribute::MakeSfx( ByteString * pAttrArray ) { SvMetaType * pType = GetType(); - DBG_ASSERT( pType, "no type for attribute" ) + DBG_ASSERT( pType, "no type for attribute" ); SvMetaType * pBaseType = pType->GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_STRUCT ) return pBaseType->MakeSfx( pAttrArray ); else @@ -1183,8 +1183,8 @@ SvMetaType * SvMetaType::GetBaseType() const *************************************************************************/ SvMetaType * SvMetaType::GetReturnType() const { - DBG_ASSERT( GetType() == TYPE_METHOD, "no method" ) - DBG_ASSERT( GetRef(), "no return type" ) + DBG_ASSERT( GetType() == TYPE_METHOD, "no method" ); + DBG_ASSERT( GetRef(), "no return type" ); return (SvMetaType *)GetRef(); } @@ -1285,7 +1285,7 @@ void SvMetaType::SetCall0( int e ) else { DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE, - "set no base type to pointer" ) + "set no base type to pointer" ); SetType( TYPE_POINTER ); } } @@ -1319,7 +1319,7 @@ void SvMetaType::SetCall1( int e ) else { DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE, - "set no base type to pointer" ) + "set no base type to pointer" ); SetType( TYPE_POINTER ); } } @@ -2071,7 +2071,7 @@ void SvMetaType::WriteMethodArgs default: { - DBG_ASSERT( FALSE, "WriteType not implemented" ) + DBG_ASSERT( FALSE, "WriteType not implemented" ); } } pAttr = pAttrList->Next(); @@ -2150,7 +2150,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, { SvMetaType * pBaseType = GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_METHOD ) pBaseType->GetReturnType()->WriteTypePrefix( @@ -2181,7 +2181,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, { SvMetaType * pBaseType = GetBaseType(); - DBG_ASSERT( pBaseType, "no base type for attribute" ) + DBG_ASSERT( pBaseType, "no base type for attribute" ); if( pBaseType->GetType() == TYPE_METHOD ) { @@ -2201,7 +2201,7 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, default: { - DBG_ASSERT( FALSE, "WriteType not implemented" ) + DBG_ASSERT( FALSE, "WriteType not implemented" ); } } } @@ -2337,7 +2337,7 @@ void SvMetaEnumValue::Load( SvPersistStream & rStm ) if( nMask >= 0x02 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm.ReadByteString( aEnumValue ); @@ -2425,7 +2425,7 @@ void SvMetaTypeEnum::Load( SvPersistStream & rStm ) if( nMask >= 0x04 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "wrong format" ) + DBG_ERROR( "wrong format" ); return; } if( nMask & 0x01 ) rStm >> aEnumValueList; diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 695a77527cfd..264baa42c298 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -174,7 +174,7 @@ BOOL SvIdlDataBase::IsBinaryFormat( SvStream & rStm ) *************************************************************************/ void SvIdlDataBase::Load( SvStream & rStm ) { - DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" ) + DBG_ASSERT( aTypeList.Count() == 0, "type list already initialized" ); SvPersistStream aPStm( *IDLAPP->pClassMgr, &rStm ); USHORT nVersion = 0; @@ -574,7 +574,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm ) // Ist genau dieser Typ return pType; - DBG_ASSERT( aTmpTypeList.First(), "mindestens ein Element" ) + DBG_ASSERT( aTmpTypeList.First(), "mindestens ein Element" ); SvMetaTypeRef xType = new SvMetaType( pType->GetName(), 'h', "dummy" ); xType->SetRef( pType ); xType->SetIn( bIn ); @@ -778,7 +778,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm ) WriteError( "error", ByteString( aFileName, RTL_TEXTENCODING_UTF8 ), aErrorText, nRow, nColumn ); - DBG_ASSERT( pTok, "token must be found" ) + DBG_ASSERT( pTok, "token must be found" ); if( !pTok ) return; -- cgit