Skip to content
Snippets Groups Projects
Commit 12efe226 authored by Matthias Steinke's avatar Matthias Steinke
Browse files

removed the last boost::thread, switched to log4cpp from the SL6 repository,...

removed the last boost::thread, switched to log4cpp from the SL6 repository, removed the last usage of Geneva
parent 8f81c6e2
No related branches found
No related tags found
No related merge requests found
project :
requirements
<linkflags>-llog4cpp
;
lib ErrLogger : [ glob *.cc : *App.cc ] : <use>$(TOP)//log4cpp : : <library>$(TOP)//log4cpp ;
lib ErrLogger : [ glob *.cc : *App.cc ] : : : ;
exe ErrLoggerTestApp : ErrLoggerTestApp.cc ErrLogger : ;
exe Log4CppTestApp : Log4CppTestApp.cc ErrLogger : ;
......@@ -5,9 +5,9 @@ lib DfuncClebschG :
[ glob *.cc : *App.cc ]
$(TOP)/qft++//qft++
$(TOP)/ErrLogger//ErrLogger
: <use>$(TOP)//Geneva
:
: <library>$(TOP)//Geneva ;
:
: ;
exe ClebschGApp : ClebschGApp.cc DfuncClebschG : ;
exe JPCdecaysApp : JPCdecaysApp.cc DfuncClebschG : ;
......
......@@ -5,11 +5,9 @@ lib MinuitFit :
[ glob *.cc : *App.cc ]
$(TOP)/qft++//qft++
$(TOP)/ErrLogger//ErrLogger
: <use>$(TOP)//Geneva
<use>$(TOP)//Minuit2
: <use>$(TOP)//Minuit2
:
: <library>$(TOP)//Geneva
<library>$(TOP)//Minuit2 ;
: <library>$(TOP)//Minuit2 ;
exe MinuitFitApp : MinuitFitApp.cc MinuitFit : ;
......@@ -3,7 +3,7 @@ path-constant TOP : . ;
local ROOTSYS = [ os.environ ROOTSYS ] ;
local rlibs = [ SHELL "$(ROOTSYS)/bin/root-config --libs" ] ;
ROOTLIBS = [ MATCH "(.*)[\n]" : $(rlibs) ] ;
BOOSTLIBS = -lboost_date_time -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -lboost_thread -lboost_test_exec_monitor -lboost_timer -lboost_chrono -lrt ;
BOOSTLIBS = -lboost_date_time -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system -lboost_test_exec_monitor -lboost_timer -lboost_chrono -lrt ;
rule split-stack-cond ( properties * )
{
......@@ -31,6 +31,7 @@ project :
<conditional>@split-stack-cond
<linkflags>$(ROOTLIBS)
<linkflags>$(BOOSTLIBS)
<linkflags>-llog4cpp
;
actions rootlibs
......@@ -38,7 +39,6 @@ actions rootlibs
$(ROOTSYS)/bin/root-config --libs
}
lib log4cpp : : <file>$(extern)/lib/liblog4cpp.a : : ;
lib Geneva : : <file>$(GENEVA)/lib/libgemfony-common.so
<file>$(GENEVA)/lib/libgemfony-geneva.so
<file>$(GENEVA)/lib/libgemfony-courtier.so
......
......@@ -48,7 +48,7 @@ AbsLh::AbsLh(std::shared_ptr<AbsLh> theAbsLhPtr):
,_calcCounter(0)
{
unsigned int noOfThreads=GlobalEnv::instance()->parser()->noOfThreads();
if(noOfThreads > boost::thread::hardware_concurrency()) noOfThreads=boost::thread::hardware_concurrency();
if(noOfThreads > std::thread::hardware_concurrency()) noOfThreads=std::thread::hardware_concurrency();
_noOfThreads = noOfThreads;
}
......@@ -58,7 +58,6 @@ AbsLh::AbsLh() :
,_phasespaceKey("Phasespace")
,_calcCounter(0)
{
// _noOfThreads = boost::thread::hardware_concurrency();
_noOfThreads = GlobalEnv::instance()->parser()->noOfThreads();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment