From 179be78e698d3b68bc1e9305735657a9f698296b Mon Sep 17 00:00:00 2001 From: richterm Date: Tue, 21 Oct 2008 13:11:06 +0000 Subject: [PATCH] correcting minor compilation warnings --- HLT/BASE/AliHLTComponentHandler.cxx | 12 ++++++------ HLT/BASE/HOMER/Makefile.am | 6 +++--- HLT/BASE/Makefile.am | 2 +- HLT/BASE/interface/Makefile.am | 2 +- HLT/BASE/util/Makefile.am | 2 +- HLT/FMD/Makefile.am | 2 +- HLT/ITS/Makefile.am | 2 +- HLT/MUON/Makefile.am | 2 +- HLT/PHOS/Makefile.am | 6 +----- HLT/RCU/Makefile.am | 2 +- HLT/SampleLib/Makefile.am | 2 +- HLT/TPCLib/Makefile.am | 2 +- HLT/TPCLib/OnlineDisplay/Makefile.am | 2 +- HLT/TRD/Makefile.am | 2 +- HLT/comp/Makefile.am | 2 +- HLT/pendolino/Makefile.am | 2 +- HLT/rec/Makefile.am | 2 +- HLT/shuttle/Makefile.am | 2 +- HLT/sim/Makefile.am | 2 +- 19 files changed, 26 insertions(+), 30 deletions(-) diff --git a/HLT/BASE/AliHLTComponentHandler.cxx b/HLT/BASE/AliHLTComponentHandler.cxx index 9b9581019ac..770f5a74ae5 100644 --- a/HLT/BASE/AliHLTComponentHandler.cxx +++ b/HLT/BASE/AliHLTComponentHandler.cxx @@ -140,9 +140,9 @@ int AliHLTComponentHandler::AnnounceVersion() // see header file for class documentation int iResult=0; #ifdef PACKAGE_STRING - void HLTbaseCompileInfo( char*& date, char*& time); - char* date=""; - char* time=""; + extern void HLTbaseCompileInfo( const char*& date, const char*& time); + const char* date=""; + const char* time=""; HLTbaseCompileInfo(date, time); if (!date) date="unknown"; if (!time) time="unknown"; @@ -407,11 +407,11 @@ int AliHLTComponentHandler::LoadLibrary( const char* libraryPath, int bActivateA fLibraryList.insert(fLibraryList.begin(), hLib); if (!phSearch) { HLTImportant("library %s loaded (%s%s)", libraryPath, hLib.fMode==kStatic?"persistent, ":"", loadtype); - typedef void (*CompileInfo)( char*& date, char*& time); + typedef void (*CompileInfo)(const char*& date, const char*& time); CompileInfo fctInfo=(CompileInfo)FindSymbol(libraryPath, "CompileInfo"); if (fctInfo) { - char* date=""; - char* time=""; + const char* date=""; + const char* time=""; (*fctInfo)(date, time); if (!date) date="unknown"; if (!time) time="unknown"; diff --git a/HLT/BASE/HOMER/Makefile.am b/HLT/BASE/HOMER/Makefile.am index 715e7a8a387..e73782ead1b 100644 --- a/HLT/BASE/HOMER/Makefile.am +++ b/HLT/BASE/HOMER/Makefile.am @@ -109,7 +109,7 @@ $(COMPILE_INFO): $(libAliHLTUtil_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ all-local: $(HOMER_DOC:.tex=.ps) $(HOMER_DOC:.tex=.pdf) @@ -124,5 +124,5 @@ $(HOMER_DOC:.tex=.ps): $(HOMER_DOC:.tex=.dvi) dvips -o $@ $^ $(HOMER_DOC:.tex=.dvi): $(HOMER_DOC) - latex $^ - latex $^ + latex $^ > /dev/null + latex $^ > /dev/null diff --git a/HLT/BASE/Makefile.am b/HLT/BASE/Makefile.am index 2f8198add8b..b9380dea6e8 100644 --- a/HLT/BASE/Makefile.am +++ b/HLT/BASE/Makefile.am @@ -65,5 +65,5 @@ $(COMPILE_INFO): $(libHLTbase_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@ + @echo 'void $(MODULE)CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/BASE/interface/Makefile.am b/HLT/BASE/interface/Makefile.am index a31e581050b..959a100ef1f 100644 --- a/HLT/BASE/interface/Makefile.am +++ b/HLT/BASE/interface/Makefile.am @@ -54,5 +54,5 @@ $(COMPILE_INFO): Makefile.am @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@ + @echo 'void $(MODULE)CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/BASE/util/Makefile.am b/HLT/BASE/util/Makefile.am index 10a4130b191..e57b6146f47 100644 --- a/HLT/BASE/util/Makefile.am +++ b/HLT/BASE/util/Makefile.am @@ -59,5 +59,5 @@ $(COMPILE_INFO): $(libAliHLTUtil_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/FMD/Makefile.am b/HLT/FMD/Makefile.am index 67e5f3e1e86..2f6649e47f8 100644 --- a/HLT/FMD/Makefile.am +++ b/HLT/FMD/Makefile.am @@ -101,5 +101,5 @@ $(COMPILE_INFO): $(libAliHLTFMD_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/ITS/Makefile.am b/HLT/ITS/Makefile.am index 5ade9829665..66c480cb0fe 100644 --- a/HLT/ITS/Makefile.am +++ b/HLT/ITS/Makefile.am @@ -62,5 +62,5 @@ $(COMPILE_INFO): $(libAliHLTITS_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/MUON/Makefile.am b/HLT/MUON/Makefile.am index 0b0a01072fd..785a81904dd 100644 --- a/HLT/MUON/Makefile.am +++ b/HLT/MUON/Makefile.am @@ -55,5 +55,5 @@ $(COMPILE_INFO): $(libAliHLTMUON_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/PHOS/Makefile.am b/HLT/PHOS/Makefile.am index 32ca51d11ce..44089fd4cf9 100644 --- a/HLT/PHOS/Makefile.am +++ b/HLT/PHOS/Makefile.am @@ -63,9 +63,5 @@ $(COMPILE_INFO): $(libAliHLTPHOS_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo '#include ' >> $@ - @echo 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ - @echo >> $@ - @echo 'void __init()'>> $@ - @echo '{std::cout << "lib$(MODULE) build on " << __DATE__ << " - " << __TIME__ << std::endl;}'>> $@ diff --git a/HLT/RCU/Makefile.am b/HLT/RCU/Makefile.am index 1d2b06bdd90..1194effc3d4 100644 --- a/HLT/RCU/Makefile.am +++ b/HLT/RCU/Makefile.am @@ -61,5 +61,5 @@ $(COMPILE_INFO): $(libAliHLTRCU_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/SampleLib/Makefile.am b/HLT/SampleLib/Makefile.am index bde2fd53a07..72da0e8248e 100644 --- a/HLT/SampleLib/Makefile.am +++ b/HLT/SampleLib/Makefile.am @@ -132,5 +132,5 @@ $(COMPILE_INFO): $(libAliHLTSample_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/TPCLib/Makefile.am b/HLT/TPCLib/Makefile.am index e78cba68e53..fbeb9d0fb81 100644 --- a/HLT/TPCLib/Makefile.am +++ b/HLT/TPCLib/Makefile.am @@ -78,5 +78,5 @@ $(COMPILE_INFO): $(libAliHLTTPC_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/TPCLib/OnlineDisplay/Makefile.am b/HLT/TPCLib/OnlineDisplay/Makefile.am index 419262fcc73..1e5a6a1dcac 100644 --- a/HLT/TPCLib/OnlineDisplay/Makefile.am +++ b/HLT/TPCLib/OnlineDisplay/Makefile.am @@ -80,7 +80,7 @@ $(COMPILE_INFO): $(libAliHLTTPCDisplay_la_SOURCES) $(pkginclude_HEADERS) $(noins @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ @echo '#include ' >> $@ - @echo 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ @echo >> $@ @echo 'extern "C" const char* __lib$(MODULE)Properties=""' >> $@ diff --git a/HLT/TRD/Makefile.am b/HLT/TRD/Makefile.am index 5df311a2745..b4cdf27982d 100644 --- a/HLT/TRD/Makefile.am +++ b/HLT/TRD/Makefile.am @@ -62,5 +62,5 @@ $(COMPILE_INFO): $(libAliHLTTPC_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/comp/Makefile.am b/HLT/comp/Makefile.am index b5df50019c7..e7d5b7930e8 100644 --- a/HLT/comp/Makefile.am +++ b/HLT/comp/Makefile.am @@ -57,5 +57,5 @@ $(COMPILE_INFO): $(libAliHLTComp_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/pendolino/Makefile.am b/HLT/pendolino/Makefile.am index fe25b80ae29..57dfb2d2071 100644 --- a/HLT/pendolino/Makefile.am +++ b/HLT/pendolino/Makefile.am @@ -56,5 +56,5 @@ $(COMPILE_INFO): $(libHLTpendolino_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HE @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/rec/Makefile.am b/HLT/rec/Makefile.am index de8e0f2d171..23eb78d2a3f 100644 --- a/HLT/rec/Makefile.am +++ b/HLT/rec/Makefile.am @@ -56,5 +56,5 @@ $(COMPILE_INFO): $(libHLTrec_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS) @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/shuttle/Makefile.am b/HLT/shuttle/Makefile.am index 60ccad1962c..9f540e14da9 100644 --- a/HLT/shuttle/Makefile.am +++ b/HLT/shuttle/Makefile.am @@ -56,5 +56,5 @@ $(COMPILE_INFO): $(libHLTshuttle_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ diff --git a/HLT/sim/Makefile.am b/HLT/sim/Makefile.am index fe7fcaff3e0..613167dc497 100644 --- a/HLT/sim/Makefile.am +++ b/HLT/sim/Makefile.am @@ -54,5 +54,5 @@ $(COMPILE_INFO): $(libHLTsim_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS) @echo '//automatically generated compilation info' > $@ @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@ @echo '//add changes in Makefile.am' >> $@ - @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ -- 2.43.5