Changeset 7786 for trunk

Timestamp:

07/11/06 20:35:27 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MZlib.cc (modified) (2 diffs)
• mbase/MZlib.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
  2006/07/11 Thomas Bretz
 
-   *  mbase/MStatusArray.cc, mdata/MDataChain.cc, mdata/MDataFormula.cc,
-      mhflux/MMcSpectrumWeight.cc, mimage/MHillasExt.cc, mjobs/MJCut.cc,
-      msignal/MExtractTimeAndChargeDigitalFilter.cc,
-      mranforest/MRanForestCalc.cc:
+   * mbase/MStatusArray.cc, mdata/MDataChain.cc, mdata/MDataFormula.cc,
+     mhflux/MMcSpectrumWeight.cc, mimage/MHillasExt.cc, mjobs/MJCut.cc,
+     msignal/MExtractTimeAndChargeDigitalFilter.cc,
+     mranforest/MRanForestCalc.cc:
      - fixed some compiler warning of the kind
          ambiguous overload for `Bool_t ? const char[14] : const TString &'
@@ -30 +30 @@
        latest Mars version)
 
+   * mbase/MZlib.[h,cc]:
+     - added some preprocessor statements which allow compilation with
+       gcc 2.95.3
+
    * mastro/MAstroCamera.cc:
      - removed path from include
-   
+
    * mastro/Makefile: 
      - added directory for MHCamera

trunk/MagicSoft/Mars/mbase/MZlib.cc

@@ -120 +120 @@
 // --------------------------------------------------------------------------
 //
-streambuf::pos_type MZlib::seekoff(streambuf::off_type offset, ios_base::seekdir dir, ios_base::openmode)
+# if (__GNUC__>2)
+streambuf::pos_type MZlib::seekoff(streambuf::off_type offset, ios_base::seekdir dir,
+                                   ios_base::openmode)
+# else
+streampos MZlib::seekoff(streamoff offset, int dir, int)
+# endif
 {
     // Using a switch instead results in:
@@ -170 +175 @@
 // --------------------------------------------------------------------------
 //
+# if (__GNUC__>2)
 streambuf::pos_type MZlib::seekpos(streambuf::pos_type pos, ios_base::openmode)
+# else
+streampos MZlib::seekpos(streampos pos, int)
+# endif
 {
     // Seek the z-stream to the given position

trunk/MagicSoft/Mars/mbase/MZlib.h

@@ -43 +43 @@
     void close();
 
+# if (__GNUC__>2)
     std::streambuf::pos_type seekoff(std::streambuf::off_type, std::ios_base::seekdir,
                                      std::ios_base::openmode = std::ios_base::in);
     std::streambuf::pos_type seekpos(std::streambuf::pos_type,
                                      std::ios_base::openmode = std::ios_base::in);
+# else
+    std::streampos seekoff(std::streamoff, int, int = std::ios::in);
+    std::streampos seekpos(std::streampos, int = std::ios::in);
+# endif
 
     ClassDef(MZlib, 0) // A C++ wrapper to istream zlib files