Salome HOME
Fix missing returns. V9_7_BR omu/fix_return_21 V9_7_0 V9_7_0rc2
authorOvidiu Mircescu <ovidiu.mircescu@edf.fr>
Wed, 19 May 2021 13:29:27 +0000 (15:29 +0200)
committerOvidiu Mircescu <ovidiu.mircescu@edf.fr>
Wed, 19 May 2021 13:29:27 +0000 (15:29 +0200)
src/bases/DynLibLoaderGNU.cxx
src/engine/Pool.cxx
src/engine/Switch.cxx
src/hmi/commandsProc.cxx

index ebbb1acf89b4016aa532efe331372d92bf22cfe2..9d46d507d841f498aeef9ecd727718e0abb15caa 100644 (file)
@@ -110,6 +110,7 @@ bool DynLibLoaderGNU::unload()
       dlclose(_handleOnLoadedLib);
       _handleOnLoadedLib = NULL;
     }
+  return false;
 }
 
 bool DynLibLoaderGNU::reload()
index ccb92b694e766ac4156324a9c3931c7b63ad1a3c..53d1465acbee2061d67a8659fab39931b9e9bfb5 100644 (file)
@@ -107,8 +107,7 @@ Any *Pool::getOutSample(int id)
   for(iter=_container.begin();iter!=_container.end();iter++)
     if((*iter).first==id)
         return (*iter).second.outValue();
-  if(iter==_container.end())
-    throw YACS::Exception("no current case set in pool");
+  throw YACS::Exception("no current case set in pool");
 }
 
 
index f1b95ea1bf1009082f55c8a408c775c6b6720471..71b63f06c7b9ece7d376aab72f585741f9d9fe1f 100644 (file)
@@ -82,15 +82,16 @@ void CollectorSwOutPort::getAllRepresented(std::set<OutPort *>& represented) con
 
 bool CollectorSwOutPort::addInPort(InPort *inPort)
 {
+  bool ret = false;
   if(_currentProducer)
     {//a specific link is beeing done
-      bool ret=_currentProducer->addInPort(inPort);
+      ret=_currentProducer->addInPort(inPort);
       _currentProducer=0;
-      return ret;
     }
   else//global links asked
     for(map<int, OutPort *>::iterator iter=_potentialProducers.begin();iter!=_potentialProducers.end();iter++)
-      (*iter).second->addInPort(inPort);
+      ret |= (*iter).second->addInPort(inPort);
+  return ret;
 }
 
 int CollectorSwOutPort::removeInPort(InPort *inPort, bool forward)
@@ -559,6 +560,7 @@ Node *Switch::edSetNode(int caseId, Node *node)
           return ret;
         }
     }
+  return 0;
 }
 
 //! Change the case of a node
index d0394bb22a7b9c8310ba4ac07edb576bd860dfec..0833fca177a67e2c87e39274a101b7ecbbea0798 100644 (file)
@@ -2470,6 +2470,7 @@ bool CommandSetSwitchSelect::localExecute()
       setErrorMsg(ex);
       return false;
     }
+  return true;
 }
 
 bool CommandSetSwitchSelect::localReverse()
@@ -2492,6 +2493,7 @@ bool CommandSetSwitchSelect::localReverse()
       setErrorMsg(ex);
       return false;
     }
+  return true;
 }
 
 // ----------------------------------------------------------------------------