Changeset 18526 for branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h

Timestamp:

06/28/16 14:29:15 (8 years ago)

Author:

dbaack

Message:

Bugfixes and gcc-5 compability changes

File:

• branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h (modified) (2 diffs)

branches/Corsika7500Compatibility/mcorsika/MCorsikaFormat.h

@@ -1 +1 @@
 #ifndef MARS_MDataFormat
 #define MARS_MDataFormat
+
+#include <iostream>
 
 #ifndef MARS_MAGIC
@@ -47 +49 @@
    Bool_t fFortranRaw = false;
 public:
-   MCorsikaFormatRaw(std::istream * in)
-        : MCorsikaFormat(in) {}
+   //MCorsikaFormatRaw(std::istream * in)
+   //    : MCorsikaFormat(in) {}
 
-   MCorsikaFormatRaw(std::istream* in, Bool_t fortranRaw)
-        : MCorsikaFormat(in), fFortranRaw(fortranRaw) {}
+   MCorsikaFormatRaw(std::istream* in, Bool_t fortranRaw = false)
+        : MCorsikaFormat(in), fFortranRaw(fortranRaw) {}//std::cout << "\n\n||||||||||||||||||||||||||||" << fortranRaw << std::endl;}
 
    Bool_t NextBlock(Int_t   readState, Int_t & blockType, Int_t & blockVersion,