Skip to content

Enabled more compiler warnings #813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jose-luis-rs wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Enabled more compiler warnings #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0078ca2
feat(r3bbase):Update R3BLogger
jose-luis-rs Jul 31, 2025
4965698
Enabled more compiler warnings
jose-luis-rs Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ check_compiler()
if(DEFINED ENV{WERROR} AND "$ENV{WERROR}")
message(STATUS "Will compile with -Werror. ")
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -Wformat-security -Werror -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable -Wfatal-errors"
"${CMAKE_CXX_FLAGS} -Wall -Wno-non-virtual-dtor -Wwrite-strings -Wpointer-arith -Wshadow -Wformat-security -Werror -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable -Wfatal-errors"
)
else()
if(NOT APPLE)
Expand All @@ -321,7 +321,7 @@ else()
"Set env WERROR to 1 to enable -Werror. If origin/dev compiles on your platform with that option, it is definitly a good idea to do that."
)
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -Wformat-security -Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-but-set-variable"
"${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-ignored-qualifiers -Wfatal-errors -Wno-vla -Wwrite-strings -Woverloaded-virtual -Wshadow -Wformat-security -Wno-sign-compare -Wno-reorder"
)
endif()
endif()
Expand Down
1 change: 1 addition & 0 deletions analysis/online/R3BFiberTrackingOnlineSpectra.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <TRandom.h>
#include <TStyle.h>
#include <TVector3.h>
#include <iostream>

#define IS_NAN(x) TMath::IsNaN(x)

Expand Down
19 changes: 3 additions & 16 deletions los/calib/R3BLosCal2Hit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,20 @@
// ----- Convert time calibrated data to hit level (single time) ----
// ------------------------------------------------------------------

#ifndef R3BLOSCAL2HIT
#define R3BLOSCAL2HIT
#pragma once

#include <map>

#include "FairTask.h"
#include <FairTask.h>

class TClonesArray;
class TH1F;
class TH2F;
class R3BEventHeader;
class R3BLosHitPar;

/**
* TODO: This explanation is humbug.
* An analysis task to apply TCAL calibration for NeuLAND.
* This class reads NeuLAND mapped items with TDC values and
* produces time items with time in [ns]. It requires TCAL
* calibration parameters, which are produced in a separate
* analysis run containing R3BLosCal2HitFill task.
*/
class R3BLosCal2Hit : public FairTask
{

public:
/**
* Default constructor.
Expand Down Expand Up @@ -244,7 +234,6 @@ class R3BLosCal2Hit : public FairTask
TH2F* fhQ3_vs_Q7_corr;
TH2F* fhQ4_vs_Q8;
TH2F* fhQ4_vs_Q8_corr;
;
TH2F* fhTresX_M;
TH2F* fhTresY_M;
TH2F* fhTresX_T;
Expand All @@ -266,7 +255,5 @@ class R3BLosCal2Hit : public FairTask
Int_t Icount = 0;

public:
ClassDef(R3BLosCal2Hit, 1)
ClassDef(R3BLosCal2Hit, 1);
};

#endif
2 changes: 1 addition & 1 deletion los/calib/R3BLosMapped2TCal.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ InitStatus R3BLosMapped2TCal::ReInit()
return kSUCCESS;
}

void R3BLosMapped2TCal::Exec(Option_t* option)
void R3BLosMapped2TCal::Exec(Option_t*)
{
// check for requested trigger (Todo: should be done globablly / somewhere else)

Expand Down
1 change: 0 additions & 1 deletion r3bbase/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ set(SRCS
R3BException.cxx
R3BFileSource.cxx
R3BFileSource2.cxx
R3BLogger.cxx
R3BModule.cxx
R3BTcutPar.cxx
R3BTsplinePar.cxx
Expand Down
1 change: 1 addition & 0 deletions r3bbase/R3BFileSource2.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <fmt/chrono.h>
#include <fmt/color.h>
#include <fmt/core.h>
#include <iostream>
#include <vector>

namespace
Expand Down
21 changes: 0 additions & 21 deletions r3bbase/R3BLogger.cxx
View file
Open in desktop

This file was deleted.

59 changes: 26 additions & 33 deletions r3bbase/R3BLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,40 @@

#pragma once

#include <cstdlib>
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>

#include <FairLogger.h>
#include <fairlogger/Logger.h>

// NOLINTBEGIN
class R3BLogger;
#include <Rtypes.h>

class R3BLogger : public FairLogger
{
public:
#define R3BLOG(severity, x) \
if (true) \
{ \
std::string fN(__FILE__); \
std::stringstream ss; \
ss << fN.substr(fN.find_last_of("/") + 1) << ":" << __LINE__ << ":" << __FUNCTION__ << "(): "; \
LOG(severity) << ss.str() << x; \
} \
else \
(void)0

#define R3BLOG_IF(severity, condition, x) \
if (true) \
{ \
std::string fNif(__FILE__); \
std::stringstream ssif; \
ssif << fNif.substr(fNif.find_last_of("/") + 1) << ":" << __LINE__ << ":" << __FUNCTION__ << "(): "; \
LOG_IF(severity, condition) << ssif.str() << x; \
} \
else \
(void)0

// NOLINTBEGIN
#define R3BLOG(severity, x) \
do \
{ \
std::string infile(__FILE__); \
std::stringstream ss; \
ss << infile.substr(infile.find_last_of("/") + 1) << ":" << __LINE__ << ":" << __FUNCTION__ << "(): "; \
LOG(severity) << ss.str() << x; \
} while (0)

#define R3BLOG_IF(severity, condition, x) \
do \
{ \
if (condition) \
{ \
std::string infile(__FILE__); \
std::stringstream ss; \
ss << infile.substr(infile.find_last_of("/") + 1) << ":" << __LINE__ << ":" << __FUNCTION__ << "(): "; \
LOG(severity) << ss.str() << x; \
} \
} while (0)
// NOLINTEND
private:
R3BLogger();
~R3BLogger();
~R3BLogger() = default;

public:
ClassDefOverride(R3BLogger, 0)
ClassDefOverride(R3BLogger, 0);
};
// NOLINTEND
Loading