Skip to content

Commit e9e948e

Browse files
N-DekkerN-Dekker
authored
Merge pull request #6426 from hjmjohnson/review-static-constexpr
STYLE: Use C++17 inline constexpr for namespace-scope header constants
2 parents cff8f8c + 149b32f commit e9e948e

6 files changed

Lines changed: 110 additions & 110 deletions

File tree

‎Modules/Core/Common/include/itkMath.h‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,59 +46,59 @@
4646

4747
namespace itk::Math
4848
{
49-
// These constants originate from VXL's vnl_math.h. They have been
50-
// moved here to improve visibility, and to ensure that the constants
51-
// are available during compile time ( as opposed to static ITK_CONSTEXPR
52-
// member variables ).
49+
// These constants originate from VXL's vnl_math.h. They are exposed as
50+
// inline constexpr namespace-scope constants so they are usable in
51+
// constant expressions with a single shared definition across translation
52+
// units.
5353

5454

5555
/** \brief \f[e\f] The base of the natural logarithm or Euler's number */
56-
static constexpr double e = vnl_math::e;
56+
inline constexpr double e = vnl_math::e;
5757
/** \brief \f[ \log_2 e \f] */
58-
static constexpr double log2e = vnl_math::log2e;
58+
inline constexpr double log2e = vnl_math::log2e;
5959
/** \brief \f[ \log_{10} e \f] */
60-
static constexpr double log10e = vnl_math::log10e;
60+
inline constexpr double log10e = vnl_math::log10e;
6161
/** \brief \f[ \log_e 2 \f] */
62-
static constexpr double ln2 = vnl_math::ln2;
62+
inline constexpr double ln2 = vnl_math::ln2;
6363
/** \brief \f[ \log_e 10 \f] */
64-
static constexpr double ln10 = vnl_math::ln10;
64+
inline constexpr double ln10 = vnl_math::ln10;
6565
/** \brief \f[ \pi \f] */
66-
static constexpr double pi = vnl_math::pi;
66+
inline constexpr double pi = vnl_math::pi;
6767
/** \brief \f[ 2\pi \f] */
68-
static constexpr double twopi = vnl_math::twopi;
68+
inline constexpr double twopi = vnl_math::twopi;
6969
/** \brief \f[ \frac{\pi}{2} \f] */
70-
static constexpr double pi_over_2 = vnl_math::pi_over_2;
70+
inline constexpr double pi_over_2 = vnl_math::pi_over_2;
7171
/** \brief \f[ \frac{\pi}{4} \f] */
72-
static constexpr double pi_over_4 = vnl_math::pi_over_4;
72+
inline constexpr double pi_over_4 = vnl_math::pi_over_4;
7373
/** \brief \f[ \frac{\pi}{180} \f] */
74-
static constexpr double pi_over_180 = vnl_math::pi_over_180;
74+
inline constexpr double pi_over_180 = vnl_math::pi_over_180;
7575
/** \brief \f[ \frac{1}{\pi} \f] */
76-
static constexpr double one_over_pi = vnl_math::one_over_pi;
76+
inline constexpr double one_over_pi = vnl_math::one_over_pi;
7777
/** \brief \f[ \frac{2}{\pi} \f] */
78-
static constexpr double two_over_pi = vnl_math::two_over_pi;
78+
inline constexpr double two_over_pi = vnl_math::two_over_pi;
7979
/** \brief \f[ \frac{180}{\pi} \f] */
80-
static constexpr double deg_per_rad = vnl_math::deg_per_rad;
80+
inline constexpr double deg_per_rad = vnl_math::deg_per_rad;
8181
/** \brief \f[ \sqrt{2\pi} \f] */
82-
static constexpr double sqrt2pi = vnl_math::sqrt2pi;
82+
inline constexpr double sqrt2pi = vnl_math::sqrt2pi;
8383
/** \brief \f[ \frac{2}{\sqrt{\pi}} \f] */
84-
static constexpr double two_over_sqrtpi = vnl_math::two_over_sqrtpi;
84+
inline constexpr double two_over_sqrtpi = vnl_math::two_over_sqrtpi;
8585
/** \brief \f[ \frac{1}{\sqrt{2\pi}} \f] */
86-
static constexpr double one_over_sqrt2pi = vnl_math::one_over_sqrt2pi;
86+
inline constexpr double one_over_sqrt2pi = vnl_math::one_over_sqrt2pi;
8787
/** \brief \f[ \sqrt{2} \f] */
88-
static constexpr double sqrt2 = vnl_math::sqrt2;
88+
inline constexpr double sqrt2 = vnl_math::sqrt2;
8989
/** \brief \f[ \sqrt{ \frac{1}{2}} \f] */
90-
static constexpr double sqrt1_2 = vnl_math::sqrt1_2;
90+
inline constexpr double sqrt1_2 = vnl_math::sqrt1_2;
9191
/** \brief \f[ \sqrt{ \frac{1}{3}} \f] */
92-
static constexpr double sqrt1_3 = vnl_math::sqrt1_3;
92+
inline constexpr double sqrt1_3 = vnl_math::sqrt1_3;
9393
/** \brief euler constant */
94-
static constexpr double euler = vnl_math::euler;
94+
inline constexpr double euler = vnl_math::euler;
9595

9696
//: IEEE double machine precision
97-
static constexpr double eps = vnl_math::eps;
98-
static constexpr double sqrteps = vnl_math::sqrteps;
97+
inline constexpr double eps = vnl_math::eps;
98+
inline constexpr double sqrteps = vnl_math::sqrteps;
9999
//: IEEE single machine precision
100-
static constexpr float float_eps = vnl_math::float_eps;
101-
static constexpr float float_sqrteps = vnl_math::float_sqrteps;
100+
inline constexpr float float_eps = vnl_math::float_eps;
101+
inline constexpr float float_sqrteps = vnl_math::float_sqrteps;
102102

103103
/** A useful macro to generate a template floating point to integer
104104
* conversion templated on the return type and using either the 32

‎Modules/Core/Common/include/itkSpatialOrientation.h‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -469,125 +469,125 @@ namespace SpatialOrientation
469469

470470
using CoordinateTerms = SpatialOrientationEnums::CoordinateTerms;
471471

472-
static constexpr CoordinateTerms ITK_COORDINATE_UNKNOWN = CoordinateTerms::ITK_COORDINATE_UNKNOWN;
473-
static constexpr CoordinateTerms ITK_COORDINATE_Right = CoordinateTerms::ITK_COORDINATE_Right;
474-
static constexpr CoordinateTerms ITK_COORDINATE_Left = CoordinateTerms::ITK_COORDINATE_Left;
475-
static constexpr CoordinateTerms ITK_COORDINATE_Posterior = CoordinateTerms::ITK_COORDINATE_Posterior;
476-
static constexpr CoordinateTerms ITK_COORDINATE_Anterior = CoordinateTerms::ITK_COORDINATE_Anterior;
477-
static constexpr CoordinateTerms ITK_COORDINATE_Inferior = CoordinateTerms::ITK_COORDINATE_Inferior;
478-
static constexpr CoordinateTerms ITK_COORDINATE_Superior = CoordinateTerms::ITK_COORDINATE_Superior;
472+
inline constexpr CoordinateTerms ITK_COORDINATE_UNKNOWN = CoordinateTerms::ITK_COORDINATE_UNKNOWN;
473+
inline constexpr CoordinateTerms ITK_COORDINATE_Right = CoordinateTerms::ITK_COORDINATE_Right;
474+
inline constexpr CoordinateTerms ITK_COORDINATE_Left = CoordinateTerms::ITK_COORDINATE_Left;
475+
inline constexpr CoordinateTerms ITK_COORDINATE_Posterior = CoordinateTerms::ITK_COORDINATE_Posterior;
476+
inline constexpr CoordinateTerms ITK_COORDINATE_Anterior = CoordinateTerms::ITK_COORDINATE_Anterior;
477+
inline constexpr CoordinateTerms ITK_COORDINATE_Inferior = CoordinateTerms::ITK_COORDINATE_Inferior;
478+
inline constexpr CoordinateTerms ITK_COORDINATE_Superior = CoordinateTerms::ITK_COORDINATE_Superior;
479479

480480
using CoordinateMajornessTerms = SpatialOrientationEnums::CoordinateMajornessTerms;
481481

482-
static constexpr CoordinateMajornessTerms ITK_COORDINATE_PrimaryMinor =
482+
inline constexpr CoordinateMajornessTerms ITK_COORDINATE_PrimaryMinor =
483483
CoordinateMajornessTerms::ITK_COORDINATE_PrimaryMinor;
484-
static constexpr CoordinateMajornessTerms ITK_COORDINATE_SecondaryMinor =
484+
inline constexpr CoordinateMajornessTerms ITK_COORDINATE_SecondaryMinor =
485485
CoordinateMajornessTerms::ITK_COORDINATE_SecondaryMinor;
486-
static constexpr CoordinateMajornessTerms ITK_COORDINATE_TertiaryMinor =
486+
inline constexpr CoordinateMajornessTerms ITK_COORDINATE_TertiaryMinor =
487487
CoordinateMajornessTerms::ITK_COORDINATE_TertiaryMinor;
488488

489489
using ValidCoordinateOrientationFlags = SpatialOrientationEnums::ValidCoordinateOrientations;
490490

491-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RIP =
491+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RIP =
492492
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RIP;
493-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LIP =
493+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LIP =
494494
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LIP;
495-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RSP =
495+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RSP =
496496
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RSP;
497-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LSP =
497+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LSP =
498498
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LSP;
499-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RIA =
499+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RIA =
500500
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RIA;
501-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LIA =
501+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LIA =
502502
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LIA;
503-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RSA =
503+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RSA =
504504
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RSA;
505-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LSA =
505+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LSA =
506506
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LSA;
507507

508-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IRP =
508+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IRP =
509509
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IRP;
510-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ILP =
510+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ILP =
511511
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ILP;
512-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SRP =
512+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SRP =
513513
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SRP;
514-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SLP =
514+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SLP =
515515
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SLP;
516-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IRA =
516+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IRA =
517517
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IRA;
518-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ILA =
518+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ILA =
519519
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ILA;
520-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SRA =
520+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SRA =
521521
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SRA;
522-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SLA =
522+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SLA =
523523
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SLA;
524524

525-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RPI =
525+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RPI =
526526
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RPI;
527-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LPI =
527+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LPI =
528528
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LPI;
529-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RAI =
529+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RAI =
530530
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RAI;
531-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LAI =
531+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LAI =
532532
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LAI;
533-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RPS =
533+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RPS =
534534
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RPS;
535-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LPS =
535+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LPS =
536536
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LPS;
537-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RAS =
537+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_RAS =
538538
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_RAS;
539-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LAS =
539+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_LAS =
540540
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_LAS;
541541

542-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PRI =
542+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PRI =
543543
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PRI;
544-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PLI =
544+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PLI =
545545
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PLI;
546-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ARI =
546+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ARI =
547547
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ARI;
548-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ALI =
548+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ALI =
549549
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ALI;
550-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PRS =
550+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PRS =
551551
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PRS;
552-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PLS =
552+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PLS =
553553
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PLS;
554-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ARS =
554+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ARS =
555555
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ARS;
556-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ALS =
556+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ALS =
557557
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ALS;
558558

559-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IPR =
559+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IPR =
560560
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IPR;
561-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SPR =
561+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SPR =
562562
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SPR;
563-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IAR =
563+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IAR =
564564
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IAR;
565-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SAR =
565+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SAR =
566566
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SAR;
567-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IPL =
567+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IPL =
568568
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IPL;
569-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SPL =
569+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SPL =
570570
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SPL;
571-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IAL =
571+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_IAL =
572572
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_IAL;
573-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SAL =
573+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_SAL =
574574
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_SAL;
575575

576-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PIR =
576+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PIR =
577577
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PIR;
578-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PSR =
578+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PSR =
579579
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PSR;
580-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_AIR =
580+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_AIR =
581581
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_AIR;
582-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ASR =
582+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ASR =
583583
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ASR;
584-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PIL =
584+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PIL =
585585
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PIL;
586-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PSL =
586+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_PSL =
587587
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_PSL;
588-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_AIL =
588+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_AIL =
589589
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_AIL;
590-
static constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ASL =
590+
inline constexpr ValidCoordinateOrientationFlags ITK_COORDINATE_ORIENTATION_ASL =
591591
ValidCoordinateOrientationFlags::ITK_COORDINATE_ORIENTATION_ASL;
592592

593593
} // end of namespace SpatialOrientation

‎Modules/Core/Common/include/itkSymmetricEigenAnalysis.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ Int2EigenValueOrderEnum(const uint8_t value)
159159

160160
#if !defined(ITK_LEGACY_REMOVE)
161161
/** Enables reverse compatibility for enumeration values */
162-
static constexpr EigenValueOrderEnum OrderByValue = EigenValueOrderEnum::OrderByValue;
163-
static constexpr EigenValueOrderEnum OrderByMagnitude = EigenValueOrderEnum::OrderByMagnitude;
164-
static constexpr EigenValueOrderEnum DoNotOrder = EigenValueOrderEnum::DoNotOrder;
162+
inline constexpr EigenValueOrderEnum OrderByValue = EigenValueOrderEnum::OrderByValue;
163+
inline constexpr EigenValueOrderEnum OrderByMagnitude = EigenValueOrderEnum::OrderByMagnitude;
164+
inline constexpr EigenValueOrderEnum DoNotOrder = EigenValueOrderEnum::DoNotOrder;
165165
#endif
166166

167167
/** \class SymmetricEigenAnalysis

0 commit comments

Comments
 (0)