From 595fc526f04ce196760dcba2c166c80e0d50d55d Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 12 May 2009 14:52:19 +0000 Subject: [PATCH] windows port --- src/ResourcesManager/ResourcesManager.cxx | 2 +- src/ResourcesManager/ResourcesManager.hxx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx index e412a7911..c874c7781 100644 --- 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; diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx index 1287d99b3..9d95ee3f7 100644 --- a/src/ResourcesManager/ResourcesManager.hxx +++ b/src/ResourcesManager/ResourcesManager.hxx @@ -33,7 +33,10 @@ #include "SALOME_LoadRateManager.hxx" #include #include +#ifdef WNT +#else #include +#endif // --- WARNING --- // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done -- 2.39.2