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

Nix the deprecated binary/unary base class that aren't actually needed 

The std::unordered_map custom function objects here don't require inheritance from the deprecated base
This commit is contained in:
Marek Roszko 2022-01-04 18:58:42 -05:00
parent e6b5cb3a5c
commit 5d3609b20b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/hashtables.h
View File

@ -33,7 +33,7 @@
// First some utility classes and functions // First some utility classes and functions
/// Equality test for "const char*" type used in very specialized KEYWORD_MAP below /// Equality test for "const char*" type used in very specialized KEYWORD_MAP below
struct iequal_to : std::binary_function< const char*, const char*, bool > struct iequal_to
{ {
bool operator()( const char* x, const char* y ) const bool operator()( const char* x, const char* y ) const
{ {
@ -77,7 +77,7 @@ struct fnv_1a
/// Hash function for wxString, counterpart of std::string hash /// Hash function for wxString, counterpart of std::string hash
struct WXSTRING_HASH : std::unary_function<wxString, std::size_t> struct WXSTRING_HASH
{ {
std::size_t operator()( const wxString& aString ) const std::size_t operator()( const wxString& aString ) const
{ {
@ -128,9 +128,5 @@ struct WXSTRING_HASH : std::unary_function<wxString, std::size_t>
*/ */
typedef std::unordered_map< const char*, int, fnv_1a, iequal_to > KEYWORD_MAP; typedef std::unordered_map< const char*, int, fnv_1a, iequal_to > KEYWORD_MAP;
/// Map a C string to an EDA_RECT.
/// The key is the classname of the derived wxformbuilder dialog.
typedef std::unordered_map< std::string, EDA_RECT > RECT_MAP;
#endif // HASHTABLES_H_ #endif // HASHTABLES_H_