[bos #32518][EDF] (2022-T3)

[tools/libbatch.git] / src / Core / CommunicationProtocol.cxx

diff --git a/src/Core/CommunicationProtocol.cxx b/src/Core/CommunicationProtocol.cxx
index c670ffd0546688d86ba585276f46aa7ea58d571d..ccb5b2fbd8a9a3d33901f7bcbe3a37deaa5f1e72 100644 (file)
--- a/src/Core/CommunicationProtocol.cxx
+++ b/src/Core/CommunicationProtocol.cxx
@@ -31,18 +31,10 @@
 #include <libbatch_config.h>
 
 #include "CommunicationProtocol.hxx"
-#ifdef HAS_RSH
- #include "CommunicationProtocolRSH.hxx"
-#endif
-#ifdef HAS_SH
- #include "CommunicationProtocolSH.hxx"
-#endif
-#ifdef HAS_SSH
- #include "CommunicationProtocolSSH.hxx"
-#endif
-#ifdef HAS_RSYNC
- #include "CommunicationProtocolRsync.hxx"
-#endif
+#include "CommunicationProtocolRSH.hxx"
+#include "CommunicationProtocolSH.hxx"
+#include "CommunicationProtocolSSH.hxx"
+#include "CommunicationProtocolRsync.hxx"
 #include "APIInternalFailureException.hxx"
 #include "RunTimeException.hxx"
 #include "Log.hxx"
@@ -64,37 +56,17 @@ namespace Batch {
   const CommunicationProtocol & CommunicationProtocol::getInstance(CommunicationProtocolType protocolType)
   {
     if (protocolType == SH) {
-#ifdef HAS_SH
       static CommunicationProtocolSH instanceSH;
       return instanceSH;
-#else
-      throw RunTimeException("Can't use SH protocol (SH tools were "
-                             "not found on the system at compile time).");
-#endif
     } else if (protocolType == RSH) {
-#ifdef HAS_RSH
       static CommunicationProtocolRSH instanceRSH;
       return instanceRSH;
-#else
-      throw RunTimeException("Can't use RSH protocol (RSH tools were "
-                             "not found on the system at compile time).");
-#endif
     } else if (protocolType == SSH) {
-#ifdef HAS_SSH
       static CommunicationProtocolSSH instanceSSH;
       return instanceSSH;
-#else
-      throw RunTimeException("Can't use SSH protocol (SSH tools were "
-                             "not found on the system at compile time).");
-#endif
     } else if (protocolType == RSYNC) {
-#ifdef HAS_RSYNC
       static CommunicationProtocolRsync instanceRsync;
       return instanceRsync;
-#else
-      throw RunTimeException("Can't use RSYNC protocol (RSYNC tools were "
-                             "not found on the system at compile time).");
-#endif
     } else
       throw APIInternalFailureException("Unknown communication protocol.");
   }