haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove uses of climits header/defines 

2 of the 3 includes never used it, and the other could be switched to
  the C++ numeric_limits class.
This commit is contained in:
Ian McInerney 2023-03-10 17:08:56 +00:00
parent d405fff1d8
commit 56b7d570f9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3d-viewer/3d_rendering/raytracing/render_3d_raytrace.cpp
View File

@ -27,7 +27,6 @@
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>
#include <climits>
#include <thread> #include <thread>
#include "render_3d_raytrace.h" #include "render_3d_raytrace.h"

13
common/eda_pattern_match.cpp
View File

@ -23,10 +23,13 @@
*/ */
#include <eda_pattern_match.h> #include <eda_pattern_match.h>
#include <limits>
#include <wx/log.h> #include <wx/log.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <algorithm> #include <algorithm>
#include <climits>
// Helper to make the code cleaner when we want this operation
#define CLAMPED_VAL_INT_MAX( x ) std::min( x, static_cast<size_t>( std::numeric_limits<int>::max() ) )
bool EDA_PATTERN_MATCH_SUBSTR::SetPattern( const wxString& aPattern ) bool EDA_PATTERN_MATCH_SUBSTR::SetPattern( const wxString& aPattern )
{ {
@ -114,8 +117,8 @@ EDA_PATTERN_MATCH::FIND_RESULT EDA_PATTERN_MATCH_REGEX::Find( const wxString& aC
size_t start, len; size_t start, len;
m_regex.GetMatch( &start, &len, 0 ); m_regex.GetMatch( &start, &len, 0 );
return { static_cast<int>( std::min( start, static_cast<size_t>( INT_MAX ) ) ), return { static_cast<int>( CLAMPED_VAL_INT_MAX( start ) ),
static_cast<int>( std::min( len, static_cast<size_t>( INT_MAX ) ) ) }; static_cast<int>( CLAMPED_VAL_INT_MAX( len ) ) };
} }
else else
{ {
@ -295,7 +298,7 @@ EDA_PATTERN_MATCH::FIND_RESULT EDA_PATTERN_MATCH_RELATIONAL::Find( const wxStrin
if( found_delta != EDA_PATTERN_NOT_FOUND ) if( found_delta != EDA_PATTERN_NOT_FOUND )
{ {
size_t found = (size_t) found_delta + lastpos; size_t found = (size_t) found_delta + lastpos;
return { static_cast<int>( std::min( found, static_cast<size_t>( INT_MAX ) ) ), 0 }; return { static_cast<int>( CLAMPED_VAL_INT_MAX( found ) ), 0 };
} }
lastpos = tokenizer.GetPosition(); lastpos = tokenizer.GetPosition();
@ -318,7 +321,7 @@ int EDA_PATTERN_MATCH_RELATIONAL::FindOne( const wxString& aCandidate ) const
wxString val = m_regex_description.GetMatch( aCandidate, 2 ); wxString val = m_regex_description.GetMatch( aCandidate, 2 );
wxString unit = m_regex_description.GetMatch( aCandidate, 3 ); wxString unit = m_regex_description.GetMatch( aCandidate, 3 );
int istart = ( start > INT_MAX ) ? INT_MAX : start; int istart = ( start > std::numeric_limits<int>::max() ) ? std::numeric_limits<int>::max() : start;
if( key.Lower() != m_key ) if( key.Lower() != m_key )
return EDA_PATTERN_NOT_FOUND; return EDA_PATTERN_NOT_FOUND;

1
eeschema/sch_sheet.cpp
View File

@ -23,7 +23,6 @@
*/ */
#include <cstdlib> #include <cstdlib>
#include <climits>
#include <bitmaps.h> #include <bitmaps.h>
#include <core/mirror.h> #include <core/mirror.h>