changes according to coding conventions

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTDataTypes.h

diff --git a/HLT/BASE/AliHLTDataTypes.h b/HLT/BASE/AliHLTDataTypes.h
index b17e7e871be060838e77c55aa6170f0b60288c14..a6f331f4db06ddcb675e9cd0351bd4b8a11ebe2c 100644 (file)
--- a/HLT/BASE/AliHLTDataTypes.h
+++ b/HLT/BASE/AliHLTDataTypes.h
@@ -11,7 +11,6 @@
     @brief  Data type declaration for the HLT module.
 */
 
-#include <vector>
 using namespace std;
 
 extern "C" {
@@ -26,9 +25,9 @@ extern "C" {
 
   typedef AliHLTUInt64_t AliHLTEventID_t;
 
-  enum AliHLTComponent_LogSeverity { kHLTLogNone=0, kHLTLogBenchmark=1, kHLTLogDebug=2, kHLTLogInfo=4, kHLTLogWarning=8, kHLTLogError=16, kHLTLogFatal=32, kHLTLogAll=0x3f, kHLTLogDefault=0x39 };
+  enum AliHLTComponentLogSeverity { kHLTLogNone=0, kHLTLogBenchmark=1, kHLTLogDebug=2, kHLTLogInfo=4, kHLTLogWarning=8, kHLTLogError=16, kHLTLogFatal=32, kHLTLogAll=0x3f, kHLTLogDefault=0x39 };
 
-  struct AliHLTComponent_EventData
+  struct AliHLTComponentEventData
   {
     AliHLTUInt32_t fStructSize;
     AliHLTEventID_t fEventID;
@@ -37,48 +36,49 @@ extern "C" {
     AliHLTUInt32_t fBlockCnt;
   };
 
-  struct AliHLTComponent_ShmData
+  struct AliHLTComponentShmData
   {
     AliHLTUInt32_t fStructSize;
     AliHLTUInt32_t fShmType;
     AliHLTUInt64_t fShmID;
   };
-    const AliHLTUInt32_t gkAliHLTComponent_InvalidShmType = 0;
-    const AliHLTUInt64_t gkAliHLTComponent_InvalidShmID = ~(AliHLTUInt64_t)0;
 
-  struct AliHLTComponent_DataType
+    const AliHLTUInt32_t gkAliHLTComponentInvalidShmType = 0;
+    const AliHLTUInt64_t gkAliHLTComponentInvalidShmID = ~(AliHLTUInt64_t)0;
+
+  struct AliHLTComponentDataType
   {
     AliHLTUInt32_t fStructSize;
     char fID[8];
     char fOrigin[4];
   };
   
-  struct AliHLTComponent_BlockData
+  struct AliHLTComponentBlockData
   {
     AliHLTUInt32_t fStructSize;
-    AliHLTComponent_ShmData fShmKey;
+    AliHLTComponentShmData fShmKey;
     AliHLTUInt32_t fOffset;
     void* fPtr;
     AliHLTUInt32_t fSize;
-    AliHLTComponent_DataType fDataType;
+    AliHLTComponentDataType fDataType;
     AliHLTUInt32_t fSpecification;
   };
 
-  struct AliHLTComponent_TriggerData
+  struct AliHLTComponentTriggerData
   {
     AliHLTUInt32_t fStructSize;
     AliHLTUInt32_t fDataSize;
     void* fData;
   };
   
-  struct AliHLTComponent_EventDoneData
+  struct AliHLTComponentEventDoneData
   {
     AliHLTUInt32_t fStructSize;
     AliHLTUInt32_t fDataSize;
     void* fData;
   };
 
-  typedef int (*AliHLTfctLogging)( void* param, AliHLTComponent_LogSeverity severity, const char* origin, const char* keyword, const char* message );
+  typedef int (*AliHLTfctLogging)( void* param, AliHLTComponentLogSeverity severity, const char* origin, const char* keyword, const char* message );
 
   struct AliHLTComponentEnvironment
   {
@@ -86,15 +86,14 @@ extern "C" {
     void* fParam;
     void* (*fAllocMemoryFunc)( void* param, unsigned long size );
 #if 0
-    int (*fAllocShmMemoryFunc)( void* param, unsigned long size, AliHLTComponent_BlockData* blockLocation ); // future addition already foreseen/envisioned
+    int (*fAllocShmMemoryFunc)( void* param, unsigned long size, AliHLTComponentBlockData* blockLocation ); // future addition already foreseen/envisioned
 #endif
-/*     int (*fMakeOutputDataBlockListFunc)( void* param, const vector<AliHLTComponent_BlockData>& blocks, AliHLTUInt32_t* blockCount, AliHLTComponent_BlockData** outputBlocks ); */
-    int (*fGetEventDoneDataFunc)( void* param, AliHLTEventID_t eventID, unsigned long size, AliHLTComponent_EventDoneData** edd );
+    int (*fGetEventDoneDataFunc)( void* param, AliHLTEventID_t eventID, unsigned long size, AliHLTComponentEventDoneData** edd );
     AliHLTfctLogging fLoggingFunc;
   };
 }
 
-inline bool operator==( const AliHLTComponent_DataType& dt1, const AliHLTComponent_DataType& dt2 )
+inline bool operator==( const AliHLTComponentDataType& dt1, const AliHLTComponentDataType& dt2 )
     {
     for ( unsigned i = 0; i < 8; i++ )
        if ( dt1.fID[i] != dt2.fID[i] )
@@ -105,7 +104,7 @@ inline bool operator==( const AliHLTComponent_DataType& dt1, const AliHLTCompone
     return true;
     }
 
-inline bool operator!=( const AliHLTComponent_DataType& dt1, const AliHLTComponent_DataType& dt2 )
+inline bool operator!=( const AliHLTComponentDataType& dt1, const AliHLTComponentDataType& dt2 )
     {
     for ( unsigned i = 0; i < 8; i++ )
        if ( dt1.fID[i] != dt2.fID[i] )