Commit 71b9f636 authored by Sarah Seif El Nasr's avatar Sarah Seif El Nasr
Browse files

Fixed errors that passed through the merge : extra INITIALIZE_EASYLOGGINGPP in src/*.c.

parent 153a021e
......@@ -8,7 +8,7 @@
#include "../tools/CMTester.h"
#include <TApplication.h>
#include "../Utils/argvparser.h"
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
#include "TROOT.h"
#ifdef __HTTP__
......@@ -27,10 +27,6 @@ using namespace Ph2_System;
using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
INITIALIZE_EASYLOGGINGPP
int main ( int argc, char* argv[] )
{
//configure the logger
......
#include <cstring>
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
#include "../Utils/Utilities.h"
#include "../tools/SignalScan.h"
#include "../tools/LatencyScan.h"
......@@ -27,8 +27,6 @@ using namespace Ph2_System;
using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
INITIALIZE_EASYLOGGINGPP
int main ( int argc, char* argv[] )
{
//configure the logger
......
......@@ -3,7 +3,7 @@
#include "../Utils/argvparser.h"
#include "../System/SystemController.h"
#include "../Utils/CommonVisitors.h"
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
// Ph2_usb_instDriverStuff
#ifdef __HTTP__
......@@ -20,10 +20,6 @@ using namespace Ph2_HwDescription;
using namespace Ph2_HwInterface;
using namespace Ph2_System;
using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
//Class used to process events acquired by a parallel acquisition
INITIALIZE_EASYLOGGINGPP
//void syntax ( int argc )
......
......@@ -8,8 +8,7 @@
#include "../tools/HybridTester.h"
#include <TApplication.h>
#include "../Utils/argvparser.h"
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
#include "TROOT.h"
#ifdef __HTTP__
......@@ -28,7 +27,6 @@ using namespace Ph2_System;
using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
INITIALIZE_EASYLOGGINGPP
int main ( int argc, char* argv[] )
{
......
......@@ -21,12 +21,11 @@
#include "../tools/AntennaTester.h"
#include "../tools/Calibration.h"
#include "../tools/PedeNoise.h"
#include "../tools/OldCalibration.h"
#include "../Utils/argvparser.h"
#include "TROOT.h"
#include "TApplication.h"
#include "../Utils/Timer.h"
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
#ifdef __HTTP__
#include "THttpServer.h"
......
......@@ -2,7 +2,7 @@
#include "../Utils/CommonVisitors.h"
#include "../Utils/argvparser.h"
#include "../Utils/Timer.h"
#include "../Utils/easylogging++.h"
//#include "../Utils/easylogging++.h"
#ifdef __HTTP__
#include "THttpServer.h"
......@@ -20,7 +20,6 @@ using namespace Ph2_System;
using namespace CommandLineProcessing;
INITIALIZE_EASYLOGGINGPP
INITIALIZE_EASYLOGGINGPP
int main ( int argc, char** argv )
{
......
......@@ -279,8 +279,6 @@ class HybridTester : public Tool
return output_string;
}
>>>>>>> 73ee7e12744871cc7af090103c17349ffa4f6025
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment