From 34dc81a4ee108aa6796d66269586ee5fdff710a6 Mon Sep 17 00:00:00 2001 From: fca Date: Sun, 9 Nov 2008 21:45:48 +0000 Subject: [PATCH] Pointer to void changed into pointer to function --- RAW/AliRawHLTManager.cxx | 4 ++-- RAW/AliRawHLTManager.h | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/RAW/AliRawHLTManager.cxx b/RAW/AliRawHLTManager.cxx index 7b67b3ee9ad..ec37f579ebe 100644 --- a/RAW/AliRawHLTManager.cxx +++ b/RAW/AliRawHLTManager.cxx @@ -47,7 +47,7 @@ AliRawHLTManager::~AliRawHLTManager() } int AliRawHLTManager::fLibraryStatus=kUnloaded; -void* AliRawHLTManager::fFctCreateRawReaderHLT=NULL; +AliRawReaderHLTCreateInstance_t AliRawHLTManager::fFctCreateRawReaderHLT=NULL; void* AliRawHLTManager::fFctCreateRawStream=NULL; AliRawReader* AliRawHLTManager::CreateRawReaderHLT(AliRawReader* pParent, const char* detectors) @@ -81,7 +81,7 @@ int AliRawHLTManager::LoadLibrary() // library has been loaded. If it was already loaded we get 0 int iTrials=0; do { - fFctCreateRawReaderHLT=gSystem->DynFindSymbol(ALIHLTREC_LIBRARY, ALIRAWREADERHLT_CREATE_INSTANCE); + fFctCreateRawReaderHLT=(AliRawReaderHLTCreateInstance_t)gSystem->DynFindSymbol(ALIHLTREC_LIBRARY, ALIRAWREADERHLT_CREATE_INSTANCE); } while (fFctCreateRawReaderHLT==NULL && gSystem->Load(ALIHLTREC_LIBRARY)==0 && iTrials++<1); if (fFctCreateRawReaderHLT) { iResult=kLoaded; diff --git a/RAW/AliRawHLTManager.h b/RAW/AliRawHLTManager.h index 53816450b69..a5d1b440c3a 100644 --- a/RAW/AliRawHLTManager.h +++ b/RAW/AliRawHLTManager.h @@ -18,9 +18,13 @@ // refer to README to build package // or // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt - + class AliRawReader; #include "TObject.h" + +extern "C" { + typedef AliRawReader* (*AliRawReaderHLTCreateInstance_t)(AliRawReader* pParentReader, const char* options); +} /** * @class AliRawHLTManager @@ -67,7 +71,7 @@ class AliRawHLTManager { static int fLibraryStatus; //!transient /** entry in the HOMER library */ - static void* fFctCreateRawReaderHLT; //!transient + static AliRawReaderHLTCreateInstance_t fFctCreateRawReaderHLT; //!transient /** entry in the HOMER library */ static void* fFctCreateRawStream; //!transient @@ -81,10 +85,5 @@ class AliRawHLTManager { #define ALIHLTREC_LIBRARY_VERSION 0 #define ALIRAWREADERHLT_CREATE_INSTANCE "AliRawReaderHLTCreateInstance" -#ifdef __cplusplus -extern "C" { -#endif - typedef AliRawReader* (*AliRawReaderHLTCreateInstance_t)(AliRawReader* pParentReader, const char* options); -} #endif //ALIRAWHLTMANAGER_H -- 2.43.0