merge conflict resolved

This commit is contained in:
Dhanya Maliakal
2017-12-01 12:44:34 +01:00
10 changed files with 98 additions and 93 deletions

View File

@@ -70,7 +70,7 @@ DataProcessor::DataProcessor(Fifo*& f, fileFormat* ftype, bool fwenable, bool* d
}
NumberofDataProcessors++;
FILE_LOG (logDEBUG) << "Number of DataProcessors: " << NumberofDataProcessors;
FILE_LOG(logDEBUG) << "Number of DataProcessors: " << NumberofDataProcessors;
memset((void*)&timerBegin, 0, sizeof(timespec));
}