Update master to aliroot

[u/mrichter/AliRoot.git] / HLT / CALO / AliHLTCaloChannelRawDataStruct.h

diff --git a/HLT/CALO/AliHLTCaloChannelRawDataStruct.h b/HLT/CALO/AliHLTCaloChannelRawDataStruct.h
index e118c52402dd610558758ba626993ed818f82b53..ff23dff7d9f8800d93465cf0e6f89471ced3746b 100644 (file)
--- a/HLT/CALO/AliHLTCaloChannelRawDataStruct.h
+++ b/HLT/CALO/AliHLTCaloChannelRawDataStruct.h
@@ -22,15 +22,41 @@
 #include "AliHLTCaloChannelDataStruct.h"
 #include "AliHLTCaloCoordinate.h"
 #include "Rtypes.h"
-#include "AliHLTCaloConstants.h"
 
-using namespace CaloHLTConst;
+// disable warnings to avoid
+// warning: base class ‘class ...’ has a non-virtual destructor
+#if defined __GNUC__
+#if __GNUC__ == 4 && __GNUC_MINOR__ > 3
+#pragma GCC diagnostic ignored "-Weffc++"
+#else
+#pragma GCC system_header 
+#endif
+#elif defined __SUNPRO_CC
+#pragma disable_warn
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+
+///comment
+
+// using namespace CaloHLTConst;
 
 struct  AliHLTCaloChannelRawDataStruct : public AliHLTCaloChannelDataStruct
 {
   AliHLTCaloCoordinate fCoordinate;
   int nSamplesUsed;
-  UShort_t fDataPtr[ALTROMAXSAMPLES];
+  // UShort_t fDataPtr[ALTROMAXSAMPLES] = {0,};
+  UShort_t fData;
 };
 
+#if defined __GNUC__
+#if __GNUC__ == 4 && __GNUC_MINOR__ > 3
+#pragma GCC diagnostic ignored "-Weffc++"
+#endif
+#elif defined __SUNPRO_CC
+#pragma enable_warn
+#elif defined _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif