mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use explicitly cast zeros to avoid compilation error with MSVC2010

Browse Source 
Could also use nullptr, is it supported by all compiler versions we use?
This commit is contained in:
Tor Lillqvist
2011-03-14 12:18:51 +02:00
parent d0c187cc8c
commit b6e36a7fa9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppu/source/threadpool/threadpool.cxx
View File

@@ -303,7 +303,7 @@ namespace cppu_threadpool
if( ii == m_mapQueue.end() ) if( ii == m_mapQueue.end() )
{ {
m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( 0 , 0 ); m_mapQueue[ aThreadId ] = pair < JobQueue * , JobQueue * > ( (JobQueue *)0 , (JobQueue*)0 );
ii = m_mapQueue.find( aThreadId ); ii = m_mapQueue.find( aThreadId );
OSL_ASSERT( ii != m_mapQueue.end() ); OSL_ASSERT( ii != m_mapQueue.end() );
} }
@@ -349,7 +349,7 @@ namespace cppu_threadpool
if( ii == m_mapQueue.end() ) if( ii == m_mapQueue.end() )
{ {
JobQueue *p = new JobQueue(); JobQueue *p = new JobQueue();
m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , 0 ); m_mapQueue[ aThreadId ] = pair< JobQueue * , JobQueue * > ( p , (JobQueue*)0 );
} }
else if( 0 == (*ii).second.first ) else if( 0 == (*ii).second.first )
{ {

4
cppu/source/uno/lbenv.cxx
View File

@@ -270,7 +270,7 @@ static void SAL_CALL defenv_registerInterface(
// try to insert dummy 0: // try to insert dummy 0:
std::pair<OId2ObjectMap::iterator, bool> const insertion( std::pair<OId2ObjectMap::iterator, bool> const insertion(
that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) );
if (insertion.second) if (insertion.second)
{ {
ObjectEntry * pOEntry = new ObjectEntry( rOId ); ObjectEntry * pOEntry = new ObjectEntry( rOId );
@@ -318,7 +318,7 @@ static void SAL_CALL defenv_registerProxyInterface(
// try to insert dummy 0: // try to insert dummy 0:
std::pair<OId2ObjectMap::iterator, bool> const insertion( std::pair<OId2ObjectMap::iterator, bool> const insertion(
that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, 0 ) ) ); that->aOId2ObjectMap.insert( OId2ObjectMap::value_type( rOId, (ObjectEntry*)0 ) ) );
if (insertion.second) if (insertion.second)
{ {
ObjectEntry * pOEntry = new ObjectEntry( rOId ); ObjectEntry * pOEntry = new ObjectEntry( rOId );