Another batch of changes for COOL #ifdef (CORALCOOL-2943)

git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20133 4525493e-7705-40b1-a816-d608a930855b

src/CoolApplication/CoolApplication/Application.h

@@ -2,7 +2,6 @@
 #define COOLAPPLICATION_APPLICATION_H 1
 
 // Include files
-#include "CoolKernel/VersionInfo.h" // kept but no longer needed
 #include "CoolApplication/IApplication.h"
 
 namespace cool

src/CoolKernel/CoolKernel/ChannelSelection.h

 #ifndef COOLKERNEL_CHANNELSELECTION_H
 #define COOLKERNEL_CHANNELSELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <limits>

src/CoolKernel/CoolKernel/CompositeSelection.h

 #ifndef COOLKERNEL_COMPOSITESELECTION_H
 #define COOLKERNEL_COMPOSITESELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/Exception.h

 #ifndef COOLKERNEL_EXCEPTION_H
 #define COOLKERNEL_EXCEPTION_H 1
 
-// First of all, enable or disable the API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <sstream>
 #include <exception>

src/CoolKernel/CoolKernel/FieldSelection.h

 #ifndef COOLKERNEL_FIELDSELECTION_H
 #define COOLKERNEL_FIELDSELECTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/FolderSpecification.h

 #ifndef COOLKERNEL_FOLDERSPECIFICATION_H
 #define COOLKERNEL_FOLDERSPECIFICATION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "CoolKernel/IFolderSpecification.h"

src/CoolKernel/CoolKernel/FolderVersioning.h

 #ifndef COOLKERNEL_FOLDERVERSIONING_H
 #define COOLKERNEL_FOLDERVERSIONING_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/HvsTagLock.h

 #ifndef COOLKERNEL_HVSTAGLOCK_H
 #define COOLKERNEL_HVSTAGLOCK_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/IDatabase.h

 #ifndef COOLKERNEL_IDATABASE_H
 #define COOLKERNEL_IDATABASE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include "CoolKernel/DatabaseId.h"

src/CoolKernel/CoolKernel/IFolder.h

 #ifndef COOLKERNEL_IFOLDER_H
 #define COOLKERNEL_IFOLDER_H 1
 
-// First of all, enable or disable API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <map>
 #include <string>

src/CoolKernel/CoolKernel/IFolderSpecification.h

 #ifndef COOLKERNEL_IFOLDERSPECIFICATION_H
 #define COOLKERNEL_IFOLDERSPECIFICATION_H 1
 
-// First of all, enable or disable API extensions (see bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include "CoolKernel/IRecordSpecification.h"
 #include "CoolKernel/FolderVersioning.h"

src/CoolKernel/CoolKernel/IHvsNode.h

 #ifndef COOLKERNEL_IHVSNODE_H
 #define COOLKERNEL_IHVSNODE_H 1
 
-// First of all, enable or disable the COOL400 API extensions
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <algorithm>

src/CoolKernel/CoolKernel/IObject.h

 #ifndef COOLKERNEL_IOBJECT_H
 #define COOLKERNEL_IOBJECT_H 1
 
-// First of all, enable or disable the API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <sstream>
 #include "CoolKernel/ChannelId.h"

src/CoolKernel/CoolKernel/ITransaction.h

 #ifndef COOLKERNEL_ITRANSACTION_H
 #define COOLKERNEL_ITRANSACTION_H 1
 
-// First of all, enable or disable the COOL400 API extensions
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // This class only exists in the COOL400 API
 #ifdef COOL400

src/CoolKernel/CoolKernel/PayloadMode.h

 #ifndef COOLKERNEL_PAYLOADMODE_H
 #define COOLKERNEL_PAYLOADMODE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/RecordException.h

 #ifndef COOLKERNEL_RECORDEXCEPTION_H
 #define COOLKERNEL_RECORDEXCEPTION_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <sstream>

src/CoolKernel/CoolKernel/StorageType.h

 #ifndef COOLKERNEL_STORAGETYPE_H
 #define COOLKERNEL_STORAGETYPE_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #ifdef COOL400CPP11ENUM

src/CoolKernel/CoolKernel/Time.h

 #ifndef COOLKERNEL_TIME_H
 #define COOLKERNEL_TIME_H 1
 
-// For COOL3, the CORAL3 TimeStamp extensions are needed
-// This is no longer checked explicitly (CORALCOOL-2943)
-#include "CoolKernel/VersionInfo.h" // kept here but no longer needed
-#include "CoralBase/VersionInfo.h" // kept here but no longer needed
-
 // Include files
 #include "CoralBase/TimeStamp.h" // NB: CORAL3 TimeStamp is needed!
 #include "CoolKernel/ITime.h"

src/CoolKernel/CoolKernel/pointers.h

 #ifndef COOLKERNEL_POINTERS_H
 #define COOLKERNEL_POINTERS_H 1
 
-// First of all, set/unset COOL400 macros
-#include "CoolKernel/VersionInfo.h"
+#include "CoolKernel/VersionInfo.h" // for #ifdef COOL400 
 
 // Include files
 #include <memory>

src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp

-// First of all, enable or disable the COOL290 API extensions (bug #92204)
-#include "CoolKernel/VersionInfo.h"
-
 // Include files
 #include <iostream>
 #include "CoolKernel/FolderSpecification.h"