SW-589: Fixed LargeFiledesIO deprecation warnings, and added include in...

SW-589: Fixed LargeFiledesIO deprecation warnings, and added include in InputParSet.h to import the conditional namespace #define in casacore2, making it compatible with both casacore2 and 3 (Merged r41783,r41784,r41928 from Cobalt2 branch)

LCS/Common/include/Common/InputParSet.h

@@ -30,10 +30,14 @@
 //# Includes
 #include <Common/ParameterSet.h>
 
+#ifdef HAVE_AIPSPP
+# include <casacore/casa/Inputs/Input.h>
+#else
 //# Forward declare Input.
 namespace casacore {
   class Input;
 }
+#endif
 
 
 namespace LOFAR {

LCS/LofarStMan/include/LofarStMan/LofarStMan.h

@@ -25,7 +25,7 @@
 //# Includes
 #include <casacore/tables/DataMan/DataManager.h>
 #include <casacore/casa/IO/MMapIO.h>
-#include <casacore/casa/IO/LargeFiledesIO.h>
+#include <casacore/casa/IO/FiledesIO.h>
 #include <casacore/casa/Containers/Block.h>
 #include <casacore/casa/Containers/Record.h>
 #include <Common/LofarTypes.h>
@@ -331,7 +331,7 @@ private:
   vector<LofarColumn*> itsColumns;
   // On 32-bit systems regular IO is used.
   int    itsFD;
-  casacore::LargeFiledesIO* itsRegFile;
+  casacore::FiledesIO* itsRegFile;
   casacore::Block<char> itsBuffer;   //# buffer of size itsBLDataSize for regular IO
   // The seqnr file (if present) is always memory-mapped because it is small.
   casacore::MMapIO*     itsSeqFile;

LCS/LofarStMan/src/LofarStMan.cc

@@ -226,8 +226,8 @@ void LofarStMan::openFiles (bool writable)
   // First close if needed.
   closeFiles();
   String fname (fileName() + "data");
-  itsFD = LargeFiledesIO::open (fname.c_str(), writable);
-  itsRegFile = new LargeFiledesIO (itsFD);
+  itsFD = FiledesIO::open (fname.c_str(), writable);
+  itsRegFile = new FiledesIO (itsFD);
   // Set correct number of rows.
   itsNrRows = itsRegFile->length() / itsBlockSize * itsAnt1.size();
   // Map the file with seqnrs.
@@ -261,7 +261,7 @@ void LofarStMan::mapSeqFile()
 void LofarStMan::closeFiles()
 {
   if (itsFD >= 0) {
-    LargeFiledesIO::close (itsFD);
+    FiledesIO::close (itsFD);
     itsFD = -1;
   }
   delete itsRegFile;