]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
avoiding gcc 4.3 warnings by defining void function pointers instead of void pointers...
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 7 Nov 2008 14:37:55 +0000 (14:37 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 7 Nov 2008 14:37:55 +0000 (14:37 +0000)
HLT/BASE/AliHLTComponent.h
HLT/BASE/AliHLTComponentHandler.cxx
HLT/BASE/AliHLTComponentHandler.h
HLT/BASE/AliHLTHOMERLibManager.cxx
HLT/BASE/AliHLTHOMERLibManager.h
HLT/BASE/AliHLTSystem.cxx
HLT/BASE/AliHLTSystem.h
HLT/rec/AliHLTReconstructor.cxx
HLT/rec/AliHLTReconstructor.h

index deb05aff550a8e10fdbbb3a28064644a4b2a2341..a9b28fcdcf5b0c80b47c5c1c6ec11c8cec8b7c09 100644 (file)
@@ -1434,7 +1434,7 @@ class AliHLTComponent : public AliHLTLogging {
   AliHLTEventDDL* fpDDLList;                                       //! transient
 
   /** external fct to set CDB run no, indicates external CDB initialization */
-  void* fCDBSetRunNoFunc;                                          //! transient
+  void (*fCDBSetRunNoFunc)();                                      //! transient
 
   /** id of the component in the analysis chain */
   string fChainId;                                                 //! transient
index 770f5a74ae500d344f125f649c2ec63cced630ac..31711a878e715f472637de10dd31046cd9351b6a 100644 (file)
@@ -547,17 +547,17 @@ int AliHLTComponentHandler::UnloadLibraries()
   return iResult;
 }
 
-void* AliHLTComponentHandler::FindSymbol(const char* library, const char* symbol)
+void (*AliHLTComponentHandler::FindSymbol(const char* library, const char* symbol))()
 {
   // see header file for class documentation
   AliHLTLibHandle* hLib=FindLibrary(library);
   if (hLib==NULL) return NULL;
-  void* pFunc=NULL;
+  void (*pFunc)()=NULL;
 #ifdef HAVE_DLFCN_H
-  pFunc=dlsym(hLib->fHandle, symbol);
+  pFunc=(void (*)())dlsym(hLib->fHandle, symbol);
 #else
   TString* name=reinterpret_cast<TString*>(hLib->fName);
-  pFunc=gSystem->DynFindSymbol(name->Data(), symbol);
+  pFunc=(void (*)())gSystem->DynFindSymbol(name->Data(), symbol);
 #endif
   return pFunc;
 }
index 00ebee759ad9149db678957ae9fe094c9a8f0047..826ba585b7c468946cd3a54e120b08d84fa510f4 100644 (file)
@@ -108,7 +108,7 @@ class AliHLTComponentHandler : public AliHLTLogging {
    * @param symbol       the symbol to find
    * @return void pointer to function
    */
-  void* FindSymbol(const char* library, const char* symbol);
+  void (*FindSymbol(const char* library, const char* symbol))();
 
   /**
    * Unload a component shared library.
index 6850fb10025d0c4d8a7b819729c090ef5c760ea1..b9ddfac68e862c4e169dc85f0add76126452379d 100644 (file)
@@ -190,12 +190,12 @@ int AliHLTHOMERLibManager::LoadHOMERLibrary()
       //HLTInfo("no build info available for %s", *library);
     }
 
-    fFctCreateReaderFromTCPPort=gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_TCPPORT);
-    fFctCreateReaderFromTCPPorts=gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_TCPPORTS);
-    fFctCreateReaderFromBuffer=gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_BUFFER);
-    fFctDeleteReader=gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_DELETE);
-    fFctCreateWriter=gSystem->DynFindSymbol(*library, ALIHLTHOMERWRITER_CREATE);
-    fFctDeleteWriter=gSystem->DynFindSymbol(*library, ALIHLTHOMERWRITER_DELETE);
+    fFctCreateReaderFromTCPPort=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_TCPPORT);
+    fFctCreateReaderFromTCPPorts=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_TCPPORTS);
+    fFctCreateReaderFromBuffer=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_CREATE_FROM_BUFFER);
+    fFctDeleteReader=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERREADER_DELETE);
+    fFctCreateWriter=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERWRITER_CREATE);
+    fFctDeleteWriter=(void (*)())gSystem->DynFindSymbol(*library, ALIHLTHOMERWRITER_DELETE);
     if (fFctCreateReaderFromTCPPort==NULL ||
        fFctCreateReaderFromTCPPorts==NULL ||
        fFctCreateReaderFromBuffer==NULL || 
index 68d42113152ecf671fdce5568090f79e4240e9b7..3bcd6b38677fa2c1d8c2dff103f92cd57e073961 100644 (file)
@@ -136,22 +136,22 @@ class AliHLTHOMERLibManager {
   int fLibraryStatus; //!transient
 
   /** entry in the HOMER library */
-  void* fFctCreateReaderFromTCPPort; //!transient
+  void (*fFctCreateReaderFromTCPPort)(); //!transient
 
   /** entry in the HOMER library */
-  void* fFctCreateReaderFromTCPPorts; //!transient
+  void (*fFctCreateReaderFromTCPPorts)(); //!transient
 
   /** entry in the HOMER library */
-  void* fFctCreateReaderFromBuffer; //!transient
+  void (*fFctCreateReaderFromBuffer)(); //!transient
 
   /** entry in the HOMER library */
-  void* fFctDeleteReader; //!transient
+  void (*fFctDeleteReader)(); //!transient
 
   /** entry in the HOMER library */
-  void* fFctCreateWriter; //!transient
+  void (*fFctCreateWriter)(); //!transient
 
   /** entry in the HOMER library */
-  void* fFctDeleteWriter; //!transient
+  void (*fFctDeleteWriter)(); //!transient
 
   ClassDef(AliHLTHOMERLibManager, 0)
 };
index e334878cb035eb2bba1fe3018de7c9cafa0dfad3..044deda6e6167fe56515e8a737762d001f6c8a83 100644 (file)
@@ -1437,7 +1437,7 @@ int AliHLTSystem::ClearStatusFlags(int flags)
   return fState;
 }
 
-void* AliHLTSystem::FindDynamicSymbol(const char* library, const char* symbol)
+void (*AliHLTSystem::FindDynamicSymbol(const char* library, const char* symbol))()
 {
   // see header file for class documentation
   if (fpComponentHandler==NULL) return NULL;
index 5feeae69e1c68dcd058cc6cb3b96cbffe1981ae6..3aa53048dcb35a4baff56630931c4dd0a85a8b1d 100644 (file)
@@ -384,7 +384,7 @@ class AliHLTSystem : public AliHLTLogging {
    * @param symbol       the symbol to find
    * @return void pointer to function
    */
-  void* FindDynamicSymbol(const char* library, const char* symbol);
+  void (*FindDynamicSymbol(const char* library, const char* symbol))();
 
   /**
    * Prepare the HLT system for running.
index fb551941fec6e6f52f3561a10945bcfaa2d1693e..5a35dc4b5398dfe1922accb3f550b579c7b07486 100644 (file)
@@ -157,7 +157,7 @@ void AliHLTReconstructor::Init()
   }
 
   gSystem->Load("libHLTinterface.so");
-  fFctProcessHLTOUT=gSystem->DynFindSymbol("libHLTinterface.so", "AliHLTSystemProcessHLTOUT");
+  fFctProcessHLTOUT=(void (*)())gSystem->DynFindSymbol("libHLTinterface.so", "AliHLTSystemProcessHLTOUT");
 
   fpEsdManager=AliHLTEsdManager::New();
 }
index a814d8229e6ec5fce6c7d3a63560f1c7fff1b983..5b9f2d66523ebece3eac924f63523ac474af009c 100644 (file)
@@ -283,7 +283,7 @@ private:
   AliHLTReconstructor& operator=(const AliHLTReconstructor& src);
 
   /** function pointer: processing of HLTOUT data */
-  void* fFctProcessHLTOUT; //!transient
+  void (*fFctProcessHLTOUT)(); //!transient
 
   /** ESD manger instance for this reconstruction */
   AliHLTEsdManager* fpEsdManager; //!transient