From 391e71c57b500a33a68b4ed639c2fdc017537ec5 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 18 Apr 2011 10:38:43 +0000 Subject: [PATCH] Fix configuration / compilation problems in KERNEL (wrong #include syntax for local header files is used) --- src/Core/Batch_BatchManager_eClient.cxx | 2 +- src/Core/Batch_CommunicationProtocol.cxx | 2 +- src/Core/Batch_CommunicationProtocolRSH.cxx | 4 ++-- src/Core/Batch_CommunicationProtocolSH.cxx | 2 +- src/Core/Batch_CommunicationProtocolSSH.cxx | 2 +- src/Core/Test/SimpleParser.cxx | 2 +- src/Core/Test/Test_SimpleParser.cxx | 2 +- src/LoadLeveler/Batch_BatchManager_eLL.cxx | 4 ++-- .../Batch_FactBatchManager_eLL.hxx | 4 ++-- src/LoadLeveler/Batch_JobInfo_eLL.cxx | 4 ++-- src/LoadLeveler/Batch_JobInfo_eLL.hxx | 2 +- src/LoadLeveler/Test/Test_eLL.cxx | 20 +++++++++---------- src/Local/Batch_FactBatchManager_Local.cxx | 2 +- src/Local/Test/Test_Local_RSH.cxx | 12 +++++------ src/Local/Test/Test_Local_SH.cxx | 16 +++++++-------- src/Local/Test/Test_Local_SSH.cxx | 12 +++++------ src/PBS/Batch_BatchManager_ePBS.cxx | 2 +- src/PBS/Test/Test_PBS.cxx | 12 +++++------ src/PBS/Test/Test_ePBS.cxx | 18 ++++++++--------- src/SSH/Batch_BatchManager_eSSH.cxx | 2 +- 20 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/Core/Batch_BatchManager_eClient.cxx b/src/Core/Batch_BatchManager_eClient.cxx index 6fc77b4..ee00ebe 100644 --- a/src/Core/Batch_BatchManager_eClient.cxx +++ b/src/Core/Batch_BatchManager_eClient.cxx @@ -44,7 +44,7 @@ #include #endif -#include +#include "Batch_config.h" #include "Batch_Constants.hxx" #include "Batch_BatchManager_eClient.hxx" diff --git a/src/Core/Batch_CommunicationProtocol.cxx b/src/Core/Batch_CommunicationProtocol.cxx index c23c722..cb67afb 100644 --- a/src/Core/Batch_CommunicationProtocol.cxx +++ b/src/Core/Batch_CommunicationProtocol.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include "Batch_config.h" #include "Batch_CommunicationProtocol.hxx" #include "Batch_CommunicationProtocolRSH.hxx" diff --git a/src/Core/Batch_CommunicationProtocolRSH.cxx b/src/Core/Batch_CommunicationProtocolRSH.cxx index 23d5f4b..2643bda 100644 --- a/src/Core/Batch_CommunicationProtocolRSH.cxx +++ b/src/Core/Batch_CommunicationProtocolRSH.cxx @@ -30,10 +30,10 @@ #include #include -#include +#include "Batch_RunTimeException.hxx" #endif -#include +#include "Batch_config.h" #include "Batch_CommunicationProtocolRSH.hxx" diff --git a/src/Core/Batch_CommunicationProtocolSH.cxx b/src/Core/Batch_CommunicationProtocolSH.cxx index d7d5085..a064ac4 100644 --- a/src/Core/Batch_CommunicationProtocolSH.cxx +++ b/src/Core/Batch_CommunicationProtocolSH.cxx @@ -26,7 +26,7 @@ * Author : Renaud BARATE - EDF R&D */ -#include +#include "Batch_config.h" #include "Batch_CommunicationProtocolSH.hxx" diff --git a/src/Core/Batch_CommunicationProtocolSSH.cxx b/src/Core/Batch_CommunicationProtocolSSH.cxx index 58eb2d5..cb163d2 100644 --- a/src/Core/Batch_CommunicationProtocolSSH.cxx +++ b/src/Core/Batch_CommunicationProtocolSSH.cxx @@ -26,7 +26,7 @@ * Author : Renaud BARATE - EDF R&D */ -#include +#include "Batch_config.h" #include "Batch_CommunicationProtocolSSH.hxx" diff --git a/src/Core/Test/SimpleParser.cxx b/src/Core/Test/SimpleParser.cxx index 162fd19..7c4dca1 100644 --- a/src/Core/Test/SimpleParser.cxx +++ b/src/Core/Test/SimpleParser.cxx @@ -31,7 +31,7 @@ #include #include -#include +#include "Test_config.h" #include "SimpleParser.hxx" diff --git a/src/Core/Test/Test_SimpleParser.cxx b/src/Core/Test/Test_SimpleParser.cxx index d0b05fc..1ae3354 100644 --- a/src/Core/Test/Test_SimpleParser.cxx +++ b/src/Core/Test/Test_SimpleParser.cxx @@ -29,7 +29,7 @@ #include #include -#include +#include "Test_config.h" #include "SimpleParser.hxx" diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.cxx b/src/LoadLeveler/Batch_BatchManager_eLL.cxx index 86dab9e..00ac0bd 100644 --- a/src/LoadLeveler/Batch_BatchManager_eLL.cxx +++ b/src/LoadLeveler/Batch_BatchManager_eLL.cxx @@ -30,8 +30,8 @@ #include #include -#include -#include +#include "Batch_NotYetImplementedException.hxx" +#include "Batch_Constants.hxx" #include "Batch_FactBatchManager_eLL.hxx" #include "Batch_BatchManager_eLL.hxx" diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx index ba6cc48..d0f48be 100644 --- a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx +++ b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx @@ -29,8 +29,8 @@ #ifndef _FACTBATCHMANAGER_ELL_H_ #define _FACTBATCHMANAGER_ELL_H_ -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_Constants.hxx" #include "Batch_BatchManager_eClient.hxx" #include "Batch_FactBatchManager_eClient.hxx" diff --git a/src/LoadLeveler/Batch_JobInfo_eLL.cxx b/src/LoadLeveler/Batch_JobInfo_eLL.cxx index 52f20ea..ab0c623 100644 --- a/src/LoadLeveler/Batch_JobInfo_eLL.cxx +++ b/src/LoadLeveler/Batch_JobInfo_eLL.cxx @@ -30,8 +30,8 @@ #include #include -#include -#include +#include "Batch_RunTimeException.hxx" +#include "Batch_Constants.hxx" #include "Batch_JobInfo_eLL.hxx" diff --git a/src/LoadLeveler/Batch_JobInfo_eLL.hxx b/src/LoadLeveler/Batch_JobInfo_eLL.hxx index c0307ca..1f941ef 100644 --- a/src/LoadLeveler/Batch_JobInfo_eLL.hxx +++ b/src/LoadLeveler/Batch_JobInfo_eLL.hxx @@ -31,7 +31,7 @@ #include -#include +#include "Batch_JobInfo.hxx" namespace Batch { diff --git a/src/LoadLeveler/Test/Test_eLL.cxx b/src/LoadLeveler/Test/Test_eLL.cxx index b3dc0b3..acdbc0c 100644 --- a/src/LoadLeveler/Test/Test_eLL.cxx +++ b/src/LoadLeveler/Test/Test_eLL.cxx @@ -31,16 +31,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_FactBatchManager_eClient.hxx" +#include "Batch_FactBatchManager_eLL.hxx" +#include "Batch_BatchManager.hxx" +#include "Batch_BatchManager_eClient.hxx" + +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/Local/Batch_FactBatchManager_Local.cxx b/src/Local/Batch_FactBatchManager_Local.cxx index 37cf921..a2e34c5 100644 --- a/src/Local/Batch_FactBatchManager_Local.cxx +++ b/src/Local/Batch_FactBatchManager_Local.cxx @@ -32,7 +32,7 @@ * */ -#include +#include "Batch_config.h" #include "Batch_BatchManager_Local.hxx" #include "Batch_FactBatchManager_Local.hxx" diff --git a/src/Local/Test/Test_Local_RSH.cxx b/src/Local/Test/Test_Local_RSH.cxx index db7203c..9c0df7f 100644 --- a/src/Local/Test/Test_Local_RSH.cxx +++ b/src/Local/Test/Test_Local_RSH.cxx @@ -30,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager.hxx" -#include +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/Local/Test/Test_Local_SH.cxx b/src/Local/Test/Test_Local_SH.cxx index 89a593f..c430ae5 100644 --- a/src/Local/Test/Test_Local_SH.cxx +++ b/src/Local/Test/Test_Local_SH.cxx @@ -30,14 +30,14 @@ #include #include -#include -#include -#include -#include -#include - -#include -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager.hxx" + +#include "Test_Local_config.h" +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/Local/Test/Test_Local_SSH.cxx b/src/Local/Test/Test_Local_SSH.cxx index 433e73e..4881c50 100644 --- a/src/Local/Test/Test_Local_SSH.cxx +++ b/src/Local/Test/Test_Local_SSH.cxx @@ -31,13 +31,13 @@ #include #include -#include -#include -#include -#include -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager.hxx" -#include +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/PBS/Batch_BatchManager_ePBS.cxx b/src/PBS/Batch_BatchManager_ePBS.cxx index 3191b6b..6d9d478 100644 --- a/src/PBS/Batch_BatchManager_ePBS.cxx +++ b/src/PBS/Batch_BatchManager_ePBS.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include "Batch_config.h" #ifdef MSVC #include diff --git a/src/PBS/Test/Test_PBS.cxx b/src/PBS/Test/Test_PBS.cxx index 1425cbd..ddec1fb 100644 --- a/src/PBS/Test/Test_PBS.cxx +++ b/src/PBS/Test/Test_PBS.cxx @@ -30,13 +30,13 @@ #include #include -#include -#include -#include -#include -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager.hxx" -#include +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/PBS/Test/Test_ePBS.cxx b/src/PBS/Test/Test_ePBS.cxx index 35f0cc5..16ccd7a 100644 --- a/src/PBS/Test/Test_ePBS.cxx +++ b/src/PBS/Test/Test_ePBS.cxx @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "Batch_Constants.hxx" +#include "Batch_Job.hxx" +#include "Batch_BatchManagerCatalog.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_FactBatchManager_eClient.hxx" +#include "Batch_BatchManager.hxx" +#include "Batch_BatchManager_eClient.hxx" + +#include "SimpleParser.hxx" using namespace std; using namespace Batch; diff --git a/src/SSH/Batch_BatchManager_eSSH.cxx b/src/SSH/Batch_BatchManager_eSSH.cxx index 5b05539..ac7f32a 100644 --- a/src/SSH/Batch_BatchManager_eSSH.cxx +++ b/src/SSH/Batch_BatchManager_eSSH.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include "Batch_config.h" #ifdef MSVC #include -- 2.39.2