Kaydet (Commit) b6e36a7f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Use explicitly cast zeros to avoid compilation error with MSVC2010

Could also use nullptr, is it supported by all compiler versions we use?
üst d0c187cc
......@@ -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 )
{
......
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment