Skip to content

Commit 33fdd83

Browse files
committed
[RECONSTRUCTION] Fix identifier preceded by whitespace in a literal operator declaration
1 parent 139c6af commit 33fdd83

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

DataFormats/Math/interface/CMSUnits.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ namespace cms_units {
2323
using angle_units::operators::convertRadToDeg;
2424

2525
// Length
26-
constexpr double operator"" _mm(long double length) { return length * 0.1; }
27-
constexpr double operator"" _cm(long double length) { return length * 1.; }
28-
constexpr double operator"" _m(long double length) { return length * 100.; }
29-
constexpr double operator"" _cm3(long double length) { return length * 1._cm * 1._cm * 1._cm; }
30-
constexpr double operator"" _m3(long double length) { return length * 1._m * 1._m * 1._m; }
31-
constexpr double operator"" _mm(unsigned long long int length) { return length * 0.1; }
32-
constexpr double operator"" _cm(unsigned long long int length) { return length * 1; }
26+
constexpr double operator""_mm(long double length) { return length * 0.1; }
27+
constexpr double operator""_cm(long double length) { return length * 1.; }
28+
constexpr double operator""_m(long double length) { return length * 100.; }
29+
constexpr double operator""_cm3(long double length) { return length * 1._cm * 1._cm * 1._cm; }
30+
constexpr double operator""_m3(long double length) { return length * 1._m * 1._m * 1._m; }
31+
constexpr double operator""_mm(unsigned long long int length) { return length * 0.1; }
32+
constexpr double operator""_cm(unsigned long long int length) { return length * 1; }
3333

3434
// Energy
35-
constexpr double operator"" _GeV(long double energy) { return energy * 1.; }
36-
constexpr double operator"" _eV(long double energy) { return energy * 1.e-9_GeV; }
37-
constexpr double operator"" _MeV(long double energy) { return energy * 1.e-3_GeV; }
38-
constexpr double operator"" _TeV(long double energy) { return energy * 1.e3_GeV; }
35+
constexpr double operator""_GeV(long double energy) { return energy * 1.; }
36+
constexpr double operator""_eV(long double energy) { return energy * 1.e-9_GeV; }
37+
constexpr double operator""_MeV(long double energy) { return energy * 1.e-3_GeV; }
38+
constexpr double operator""_TeV(long double energy) { return energy * 1.e3_GeV; }
3939

4040
// Add these conversion functions to this namespace for convenience
4141
using angle_units::operators::convertCm2ToMm2;

DataFormats/Math/interface/GeantUnits.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,36 @@ namespace geant_units {
2828
using angle_units::operators::convertRadToDeg;
2929

3030
// Length
31-
constexpr double operator"" _mm(long double length) { return length * 1.; }
32-
constexpr double operator"" _cm(long double length) { return length * 10.; }
33-
constexpr double operator"" _m(long double length) { return length * 1000.; }
34-
constexpr double operator"" _cm3(long double length) { return length * 1._cm * 1._cm * 1._cm; }
35-
constexpr double operator"" _m3(long double length) { return length * 1._m * 1._m * 1._m; }
36-
constexpr double operator"" _mm(unsigned long long int length) { return length * 1; }
37-
constexpr double operator"" _cm(unsigned long long int length) { return length * 10; }
31+
constexpr double operator""_mm(long double length) { return length * 1.; }
32+
constexpr double operator""_cm(long double length) { return length * 10.; }
33+
constexpr double operator""_m(long double length) { return length * 1000.; }
34+
constexpr double operator""_cm3(long double length) { return length * 1._cm * 1._cm * 1._cm; }
35+
constexpr double operator""_m3(long double length) { return length * 1._m * 1._m * 1._m; }
36+
constexpr double operator""_mm(unsigned long long int length) { return length * 1; }
37+
constexpr double operator""_cm(unsigned long long int length) { return length * 10; }
3838

3939
// Time
40-
constexpr double operator"" _s(long double x) { return x * seconds; }
41-
constexpr double operator"" _ns(long double x) { return x * nanoseconds; }
40+
constexpr double operator""_s(long double x) { return x * seconds; }
41+
constexpr double operator""_ns(long double x) { return x * nanoseconds; }
4242

4343
// Energy
44-
constexpr double operator"" _MeV(long double energy) { return energy * 1.; }
45-
constexpr double operator"" _eV(long double energy) { return energy * 1.e-6_MeV; }
46-
constexpr double operator"" _TeV(long double energy) { return energy * 1.e6_MeV; }
47-
constexpr double operator"" _GeV(long double energy) { return energy * 1000._MeV; }
44+
constexpr double operator""_MeV(long double energy) { return energy * 1.; }
45+
constexpr double operator""_eV(long double energy) { return energy * 1.e-6_MeV; }
46+
constexpr double operator""_TeV(long double energy) { return energy * 1.e6_MeV; }
47+
constexpr double operator""_GeV(long double energy) { return energy * 1000._MeV; }
4848

4949
// Mass
5050
constexpr double operator"" _kg(long double mass) {
5151
return mass * (1._eV / 1.602176487e-19) * 1._s * 1._s / (1._m * 1._m);
5252
}
53-
constexpr double operator"" _g(long double mass) { return mass * 1.e-3_kg; }
54-
constexpr double operator"" _mg(long double mass) { return mass * 1.e-3_g; }
55-
constexpr double operator"" _mole(long double mass) { return mass * 1.; }
53+
constexpr double operator""_g(long double mass) { return mass * 1.e-3_kg; }
54+
constexpr double operator""_mg(long double mass) { return mass * 1.e-3_g; }
55+
constexpr double operator""_mole(long double mass) { return mass * 1.; }
5656

5757
// Material properties
58-
constexpr double operator"" _mg_per_cm3(long double density) { return density * 1._mg / 1._cm3; }
59-
constexpr double operator"" _g_per_cm3(long double density) { return density * 1._g / 1._cm3; }
60-
constexpr double operator"" _g_per_mole(long double mass) { return mass * 1._g / 1._mole; }
58+
constexpr double operator""_mg_per_cm3(long double density) { return density * 1._mg / 1._cm3; }
59+
constexpr double operator""_g_per_cm3(long double density) { return density * 1._g / 1._cm3; }
60+
constexpr double operator""_g_per_mole(long double mass) { return mass * 1._g / 1._mole; }
6161

6262
// Add these conversion functions to this namespace for convenience
6363
using angle_units::operators::convertCm2ToMm2;

0 commit comments

Comments
 (0)