Issue 0020194: EDF 977 ALL: Get rid of warnings PACKAGE_VERSION already defined

[modules/kernel.git] / src / ResourcesManager / ResourcesManager.cxx

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index e412a7911eec8bd7a8c524d1d605cc7bcbbc7710..c874c7781296e2d4c0e117ae856d573c11cd76a2 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -160,7 +160,7 @@ ResourcesManager_cpp::GetFittingResources(const machineParams& params) throw(Res
 
   // PaCO++ parallel container case
   std::string parallelLib(params.parallelLib);
-  if (params.nb_component_nodes > 0 and parallelLib != "")
+  if (params.nb_component_nodes > 0 && parallelLib != "")
   {
 #if defined(_DEBUG_) || defined(_DEBUG)
     std::cerr << "[GetFittingResources] ParallelContainer case" << std::endl;