From 7309f7049f78a62d898d3ca155d53481c26ed713 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 26 Apr 2025 10:33:02 +0200 Subject: [PATCH] Fix a collision name (ERROR, replaced by TS_ERROR) in a header on Windows/msys2 --- .../transline_calculations/coupled_microstrip.cpp | 12 ++++++------ .../transline_calculations/coupled_stripline.cpp | 14 +++++++------- common/transline_calculations/microstrip.cpp | 8 ++++---- common/transline_calculations/stripline.cpp | 8 ++++---- .../transline_calculation_base.h | 5 +++-- pcb_calculator/transline/transline.cpp | 2 +- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/common/transline_calculations/coupled_microstrip.cpp b/common/transline_calculations/coupled_microstrip.cpp index 60e689a767..66f86685d5 100644 --- a/common/transline_calculations/coupled_microstrip.cpp +++ b/common/transline_calculations/coupled_microstrip.cpp @@ -162,9 +162,9 @@ void COUPLED_MICROSTRIP::SetAnalysisResults() const bool L_invalid = !std::isfinite( L ) || L < 0; const bool S_invalid = !std::isfinite( S ) || S <= 0; - SetAnalysisResult( TCP::Z0_E, Z0_E, Z0_E_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0_E, Z0_E, Z0_E_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); @@ -201,9 +201,9 @@ void COUPLED_MICROSTRIP::SetSynthesisResults() SetAnalysisResult( TCP::Z0_E, Z0_E, Z0_E_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); } diff --git a/common/transline_calculations/coupled_stripline.cpp b/common/transline_calculations/coupled_stripline.cpp index dbb40939c1..a4626962ae 100644 --- a/common/transline_calculations/coupled_stripline.cpp +++ b/common/transline_calculations/coupled_stripline.cpp @@ -231,10 +231,10 @@ void COUPLED_STRIPLINE::SetAnalysisResults() const bool L_invalid = !std::isfinite( L ) || L < 0; const bool S_invalid = !std::isfinite( S ) || S <= 0; - SetAnalysisResult( TCP::Z0_E, Z0_E, Z0_E_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::Z_DIFF, Z_DIFF, Z_DIFF_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::ANG_L, ang_l, ANG_L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0_E, Z0_E, Z0_E_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z_DIFF, Z_DIFF, Z_DIFF_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::ANG_L, ang_l, ANG_L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); @@ -268,9 +268,9 @@ void COUPLED_STRIPLINE::SetSynthesisResults() SetSynthesisResult( TCP::Z0_O, Z0_O, Z0_O_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::Z_DIFF, Z_DIFF, Z_DIFF_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::ANG_L, ang_l, ANG_L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_S, S, S_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); } diff --git a/common/transline_calculations/microstrip.cpp b/common/transline_calculations/microstrip.cpp index cc31b3a24e..4f58c4626b 100644 --- a/common/transline_calculations/microstrip.cpp +++ b/common/transline_calculations/microstrip.cpp @@ -96,8 +96,8 @@ void MICROSTRIP::SetAnalysisResults() const bool L_invalid = !std::isfinite( L ) || L < 0; const bool W_invalid = !std::isfinite( W ) || W <= 0; - SetAnalysisResult( TCP::Z0, Z0, Z0_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0, Z0, Z0_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); } @@ -123,8 +123,8 @@ void MICROSTRIP::SetSynthesisResults() SetSynthesisResult( TCP::Z0, Z0, Z0_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); } diff --git a/common/transline_calculations/stripline.cpp b/common/transline_calculations/stripline.cpp index bc5193bea6..c836526a0f 100644 --- a/common/transline_calculations/stripline.cpp +++ b/common/transline_calculations/stripline.cpp @@ -81,8 +81,8 @@ void STRIPLINE::SetAnalysisResults() if( GetParameter( TCP::STRIPLINE_A ) + GetParameter( TCP::T ) >= GetParameter( TCP::H ) ) invalid = true; - SetAnalysisResult( TCP::Z0, Z0, Z0_invalid || invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::Z0, Z0, Z0_invalid || invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetAnalysisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::PHYS_WIDTH, W, W_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetAnalysisResult( TCP::STRIPLINE_A, GetParameter( TCP::STRIPLINE_A ), @@ -118,8 +118,8 @@ void STRIPLINE::SetSynthesisResults() SetSynthesisResult( TCP::Z0, Z0, Z0_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::ANG_L, ANG_L, ANG_L_invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); - SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid || invalid ? TRANSLINE_STATUS::ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_LEN, L, L_invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); + SetSynthesisResult( TCP::PHYS_WIDTH, W, W_invalid || invalid ? TRANSLINE_STATUS::TS_ERROR : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::STRIPLINE_A, GetParameter( TCP::STRIPLINE_A ), invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); SetSynthesisResult( TCP::T, GetParameter( TCP::T ), invalid ? TRANSLINE_STATUS::WARNING : TRANSLINE_STATUS::OK ); diff --git a/common/transline_calculations/transline_calculation_base.h b/common/transline_calculations/transline_calculation_base.h index 7823477e20..e55c750a67 100644 --- a/common/transline_calculations/transline_calculation_base.h +++ b/common/transline_calculations/transline_calculation_base.h @@ -91,12 +91,13 @@ enum class TRANSLINE_STATUS { OK, WARNING, - ERROR + TS_ERROR // ERROR name is colliding with a define on Windows }; /** -* The base class for all transmission line calculations. This is used by the PCB calculator, and by delay profiles +* The base class for all transmission line calculations. +* This is used by the PCB calculator, and by delay profiles */ class TRANSLINE_CALCULATION_BASE { diff --git a/pcb_calculator/transline/transline.cpp b/pcb_calculator/transline/transline.cpp index f40b31a6a1..82dd56bdb0 100644 --- a/pcb_calculator/transline/transline.cpp +++ b/pcb_calculator/transline/transline.cpp @@ -452,7 +452,7 @@ char TRANSLINE::convertParameterStatusCode( TRANSLINE_STATUS aStatus ) { case TRANSLINE_STATUS::OK: return TRANSLINE_OK; case TRANSLINE_STATUS::WARNING: return TRANSLINE_WARNING; - case TRANSLINE_STATUS::ERROR: return TRANSLINE_ERROR; + case TRANSLINE_STATUS::TS_ERROR: return TRANSLINE_ERROR; } return TRANSLINE_OK;