Skip to content

Commit 562fdd9

Browse files
committed
address modernize-concat-nested-namespaces issues
1 parent fbf815e commit 562fdd9

25 files changed

+49
-156
lines changed

multi_physics/QED/include/picsar_qed/containers/picsar_array.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
#include <array>
1111
#endif
1212

13-
namespace picsar{
14-
namespace multi_physics{
15-
namespace containers{
13+
namespace picsar::multi_physics::containers
14+
{
1615

1716
#ifdef PXRMP_ENABLE_GPU_FRIENDLY_ARRAY
1817

@@ -127,8 +126,6 @@ namespace containers{
127126
using picsar_array = std::array<T, N>;
128127
#endif
129128

130-
}
131-
}
132129
}
133130

134131
#endif //PICSAR_MULTIPHYSICS_ARRAY

multi_physics/QED/include/picsar_qed/containers/picsar_span.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66

77
#include <cstddef>
88

9-
namespace picsar{
10-
namespace multi_physics{
11-
namespace containers{
12-
9+
namespace picsar::multi_physics::containers
10+
{
1311
/**
1412
* This class implements a non-owning array
1513
*
@@ -134,7 +132,5 @@ namespace containers{
134132
T* m_ptr_data = nullptr; /* Raw pointer to the array data */
135133
};
136134
}
137-
}
138-
}
139135

140136
#endif //PICSAR_MULTIPHYSICS_SPAN

multi_physics/QED/include/picsar_qed/containers/picsar_tables.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
#include <cmath>
2121
#include <stdexcept>
2222

23-
namespace picsar{
24-
namespace multi_physics{
25-
namespace containers{
23+
namespace picsar::multi_physics::containers
24+
{
2625

2726
namespace details{
2827
//________________ Auxiliary functions _____________________________________
@@ -1435,8 +1434,6 @@ namespace details{
14351434

14361435

14371436
}
1438-
}
1439-
}
14401437

14411438

14421439

multi_physics/QED/include/picsar_qed/math/cmath_overloads.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
#include <sycl/sycl.hpp>
1111
#endif
1212

13-
namespace picsar{
14-
namespace multi_physics{
15-
namespace math{
13+
namespace picsar::multi_physics::math
14+
{
1615

1716
#ifdef PXRMP_PREVENT_USE_STD_FOR_MATH
1817

@@ -355,8 +354,6 @@ namespace math{
355354
#endif
356355

357356
}
358-
}
359-
}
360357

361358

362359
#endif //PICSAR_MULTIPHYSICS_CMATH_OVERLOADS

multi_physics/QED/include/picsar_qed/math/math_constants.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
//Should be included by all the src files of the library
55
#include "picsar_qed/qed_commons.h"
66

7-
namespace picsar{
8-
namespace multi_physics{
9-
namespace math{
7+
namespace picsar::multi_physics::math
8+
{
109

1110
// Mathemtatical constants
1211
template<typename RealType = double>
@@ -42,7 +41,5 @@ namespace math{
4241
constexpr RealType five_thirds = RealType(5.0/3.0);
4342
//________________________
4443
}
45-
}
46-
}
4744

4845
#endif //PICSAR_MULTIPHYSICS_MATH_CONSTANTS

multi_physics/QED/include/picsar_qed/math/quadrature.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ namespace boost
3838
//______________________________________________________
3939

4040

41-
namespace picsar{
42-
namespace multi_physics{
43-
namespace math{
41+
namespace picsar::multi_physics::math
42+
{
4443
/**
4544
* This module is a wrapper around the trapezoidal,
4645
* gauss_kronrod, tanh_sinh & exp_sinh quadrature methods provided by the Boost library.
@@ -178,7 +177,5 @@ namespace math{
178177
f, a, std::numeric_limits<RealType>::infinity());
179178
}
180179
}
181-
}
182-
}
183180

184181
#endif //PICSAR_MULTIPHYSICS_QUADRATURE

multi_physics/QED/include/picsar_qed/math/special_functions.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
#include <boost/math/special_functions/bessel.hpp>
1414
#endif
1515

16-
namespace picsar{
17-
namespace multi_physics{
18-
namespace math{
19-
16+
namespace picsar::multi_physics::math
17+
{
2018
/**
2119
* This function is a wrapper around the Bessel function
2220
* of the second kind defined either in the STL (if C++17 is available)
@@ -38,7 +36,5 @@ namespace math{
3836
}
3937

4038
}
41-
}
42-
}
4339

4440
#endif //PICSAR_MULTIPHYSICS_SPECIAL_FUNCTIONS

multi_physics/QED/include/picsar_qed/math/vec_functions.hpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
//Uses sqrt
1010
#include "picsar_qed/math/cmath_overloads.hpp"
1111

12-
namespace picsar{
13-
namespace multi_physics{
14-
namespace math{
12+
namespace picsar::multi_physics::math
13+
{
1514

1615
//This .hpp file contains functions to perform operations on 3-vectors
1716
// (norm, scalar multiplication, vector and cross product...)
@@ -176,7 +175,5 @@ namespace math{
176175
}
177176

178177
}
179-
}
180-
}
181178

182179
#endif // PICSAR_MULTIPHYSICS_VEC_FUNCTIONS

multi_physics/QED/include/picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables.hpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@
3636
#include <limits>
3737
#include <stdexcept>
3838

39-
namespace picsar{
40-
namespace multi_physics{
41-
namespace phys{
42-
namespace breit_wheeler{
39+
namespace picsar::multi_physics::phys::breit_wheeler
40+
{
4341

4442
//________________ Default parameters ______________________________________
4543

@@ -838,8 +836,5 @@ namespace breit_wheeler{
838836
//__________________________________________________________________________
839837

840838
}
841-
}
842-
}
843-
}
844839

845840
#endif // PICSAR_MULTIPHYSICS_BREIT_WHEELER_ENGINE_TABLES

multi_physics/QED/include/picsar_qed/physics/breit_wheeler/breit_wheeler_engine_tables_generator.hpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535
#include <type_traits>
3636
#include <stdexcept>
3737

38-
namespace picsar{
39-
namespace multi_physics{
40-
namespace phys{
41-
namespace breit_wheeler{
38+
namespace picsar::multi_physics::phys::breit_wheeler
39+
{
4240

4341
//________________ dN/dt table _____________________________________________
4442

@@ -244,8 +242,5 @@ namespace breit_wheeler{
244242

245243
//__________________________________________________________________________
246244
}
247-
}
248-
}
249-
}
250245

251246
#endif //PICSAR_MULTIPHYSICS_BREIT_WHEELER_ENGINE_TABLES_GENERATOR

0 commit comments

Comments
 (0)