diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-14 12:18:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-14 12:20:35 +0200 |
| commit | b6e36a7fa96ffbe722ef7fd47aab34247716e2fb (patch) | |
| tree | 78d31eb31db76fe9bc924680e54f6d5c0285209d | |
| parent | d0c187cc8cc78b661726dad8a75d20af595085f1 (diff) | |
Use explicitly cast zeros to avoid compilation error with MSVC2010
Could also use nullptr, is it supported by all compiler versions we use?
| -rw-r--r-- | cppu/source/threadpool/threadpool.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index ec828d99fd0d..b21d0b758bc5 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -303,7 +303,7 @@ namespace cppu_threadpool 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 ); OSL_ASSERT( ii != m_mapQueue.end() ); } @@ -349,7 +349,7 @@ namespace cppu_threadpool if( ii == m_mapQueue.end() ) { 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 ) { diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 2cd834cec65b..a47cc0dfcace 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -270,7 +270,7 @@ static void SAL_CALL defenv_registerInterface( // try to insert dummy 0: 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) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); @@ -318,7 +318,7 @@ static void SAL_CALL defenv_registerProxyInterface( // try to insert dummy 0: 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) { ObjectEntry * pOEntry = new ObjectEntry( rOId ); |