Patch from CEA for compilation on MSVC++ 2010.

diff --git a/src/engine/LinkInfo.cxx b/src/engine/LinkInfo.cxx
index f2e4101b32eb5fbf72ed1d4ae7e5e62791145c6d..1db7bd31d3669d7dbf75a004c2dc44900feecfb1 100644 (file)
--- a/src/engine/LinkInfo.cxx
+++ b/src/engine/LinkInfo.cxx
@@ -276,7 +276,7 @@ std::pair<OutPort *, InPort *> LinkInfo::getInfoLink(unsigned id, InfoReason rea
   if(iter!=_infos.end())
     return (*iter).second[id];
   else
-    return pair<OutPort *, InPort *>(0,0);
+    return pair<OutPort *, InPort *>( reinterpret_cast<OutPort *>(0), reinterpret_cast<InPort *>(0) );
 }
 
 std::vector< std::pair<OutPort *, InPort *> > LinkInfo::getWarnLink(unsigned id, WarnReason reason) const
@@ -291,16 +291,16 @@ std::vector< std::pair<OutPort *, InPort *> > LinkInfo::getWarnLink(unsigned id,
 std::pair<OutPort *, InPort *> LinkInfo::getErrLink(unsigned id, ErrReason reason) const
 {
   if(reason==E_NEVER_SET_INPUTPORT)
-    return pair<OutPort *, InPort *>(0,_unsetInPort[id]);
+    return pair<OutPort *, InPort *>( reinterpret_cast<OutPort *>(0), _unsetInPort[id] );
   else if(reason==E_ONLY_BACKWARD_DEFINED)
-    return pair<OutPort *, InPort *>(0,_onlyBackDefined[id]);
+    return pair<OutPort *, InPort *>( reinterpret_cast<OutPort *>(0), _onlyBackDefined[id] );
   else
     {
       map<ErrReason, vector< pair<OutPort *,InPort *> > >::const_iterator iter=_errors.find(reason);
       if(iter!=_errors.end())
         return (*iter).second[id];
       else
-        return pair<OutPort *, InPort *>(0,0);
+        return pair<OutPort *, InPort *>( reinterpret_cast<OutPort *>(0), reinterpret_cast<InPort *>(0) );
     }
 }
 

diff --git a/src/engine/Test/engineIntegrationTest.cxx b/src/engine/Test/engineIntegrationTest.cxx
index cb38a3d0922bf68fd759fe320ece7b62d3fbc2a7..fed7650e97b295d97321aa04cbd3000a95454289 100644 (file)
--- a/src/engine/Test/engineIntegrationTest.cxx
+++ b/src/engine/Test/engineIntegrationTest.cxx
@@ -3015,7 +3015,7 @@ void EngineIntegrationTest::testForCheckConsistency1()
   CPPUNIT_ASSERT_EQUAL(0,(int)info.getNumberOfInfoLinks(I_ALL)); CPPUNIT_ASSERT_EQUAL(0,(int)info.getNumberOfWarnLinksGrp(W_ALL));
   CPPUNIT_ASSERT_EQUAL(1,(int)info.getNumberOfErrLinks(E_ALL)); CPPUNIT_ASSERT_EQUAL(1,(int)info.getNumberOfErrLinks(E_ALL));
   CPPUNIT_ASSERT_EQUAL(1,(int)info.getNumberOfErrLinks(E_NEVER_SET_INPUTPORT));
-  pair<OutPort *, InPort *> p1=info.getErrLink(0,E_NEVER_SET_INPUTPORT); pair<OutPort *, InPort *> p2(0,i11_1);
+  pair<OutPort *, InPort *> p1=info.getErrLink(0,E_NEVER_SET_INPUTPORT); pair<OutPort *, InPort *> p2( reinterpret_cast<OutPort *>(0), i11_1 );
   CPPUNIT_ASSERT(p1==p2);
   //
   i11_1->edInit(3.14);