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

Remove unused Boost code/includes

This commit is contained in:
Ian McInerney 2021-06-02 15:21:06 +01:00
parent 9a07b03b4c
commit f03ca3259e
2 changed files with 3 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/tools/ee_inspection_tool.h
View File

@ -25,7 +25,6 @@
#ifndef EE_INSPECTION_TOOL_H #ifndef EE_INSPECTION_TOOL_H
#define EE_INSPECTION_TOOL_H #define EE_INSPECTION_TOOL_H
#include <boost/optional/optional.hpp>
#include <tools/ee_tool_base.h> #include <tools/ee_tool_base.h>
#include <sch_base_frame.h> #include <sch_base_frame.h>

54
include/hashtables.h
View File

@ -25,13 +25,12 @@
#ifndef HASHTABLES_H_ #ifndef HASHTABLES_H_
#define HASHTABLES_H_ #define HASHTABLES_H_
#include <unordered_map>
#include <eda_item.h> #include <eda_item.h>
#include <wx/string.h> #include <wx/string.h>
// Two competing strategies for providing portable hashtables are given: // First some utility classes and functions
// std C++ and boost.
// First some utility classes and functions common to both strategies.
/// 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 : std::binary_function< const char*, const char*, bool >
@ -95,14 +94,6 @@ struct WXSTRING_HASH : std::unary_function<wxString, std::size_t>
}; };
class NETINFO_ITEM;
#if 1 // C++ std::unordered_map, trying it now
#include <unordered_map>
#ifdef SWIG #ifdef SWIG
/// Declare a std::unordered_map and also the swig %template in unison /// Declare a std::unordered_map and also the swig %template in unison
#define DECL_HASH_FOR_SWIG( TypeName, KeyType, ValueType ) \ #define DECL_HASH_FOR_SWIG( TypeName, KeyType, ValueType ) \
@ -142,43 +133,4 @@ typedef std::unordered_map< const char*, int, fnv_1a, iequal_to > KEYWORD_MAP;
typedef std::unordered_map< std::string, EDA_RECT > RECT_MAP; typedef std::unordered_map< std::string, EDA_RECT > RECT_MAP;
#elif 1 // boost::unordered_map
// fix a compile bug at line 97 of boost/detail/container_fwd.hpp
#define BOOST_DETAIL_TEST_FORCE_CONTAINER_FWD
#include <boost/unordered_map.hpp>
// see http://www.boost.org/doc/libs/1_49_0/doc/html/boost/unordered_map.html
/**
* A hashtable made of a const char* and an int.
*
* @note The use of this type outside very specific circumstances is foolish since there is
* no storage provided for the actual C string itself.
*
* This type assumes use with type #KEYWORD that is created by CMake and that table creates
* *constant* storage for C strings (and pointers to those C strings). Here we are only
* interested in the C strings themselves and only the pointers are duplicated within the
* hashtable. If the strings were not constant and fixed, this type would not work. Also
* note that normally a hashtable (i.e. unordered_map) using a const char* key would simply
* compare the 32 bit or 64 bit pointers themselves, rather than the C strings which they
* are known to point to in this context. I force the latter behavior by supplying both
* "hash" and "equality" overloads to the hashtable (unordered_map) template.
*
* @author Dick Hollenbeck
*/
typedef boost::unordered_map< const char*, int, fnv_1a, iequal_to > KEYWORD_MAP;
/// Map a std::string to an #EDA_RECT.
/// The key is the classname of the derived wxformbuilder dialog.
typedef boost::unordered_map< std::string, EDA_RECT > RECT_MAP;
typedef boost::unordered_map< const wxString, NETINFO_ITEM*, WXSTRING_HASH > NETNAMES_MAP;
typedef boost::unordered_map< const int, NETINFO_ITEM* > NETCODES_MAP;
#endif
#endif // HASHTABLES_H_ #endif // HASHTABLES_H_