[Libreoffice-commits] .: cppu/source

[Tor Lillqvist]

 cppu/source/threadpool/threadpool.cxx |    4 ++--
 cppu/source/uno/lbenv.cxx             |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aff90fa06ada67f278c21d9852bf096f930b502d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Mar 14 12:18:51 2011 +0200

    Use explicitly cast zeros to avoid compilation error with MSVC2010
    
    Could also use nullptr, is it supported by all compiler versions we use?

diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index cdd2776..052be04 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 edadca2..66bcaf9 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 );