solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Stop testing for pre-standard hash map/set classes

Browse source 
Always use std::unordered_{map,set} when we use them at all, don't
bother with checking for their availability and with tr1 or even older
alternatives.
This commit is contained in:
Vadim Zeitlin 2022-10-11 00:22:40 +02:00
parent a0ae0cd316
commit 86348a9d28
10 changed files with 21 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

32
build/cmake/setup.cmake
View file

@ -132,38 +132,6 @@ if(NOT MSVC)
endif()
endif()
wx_check_cxx_source_compiles("
std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;"
HAVE_HASH_MAP
hash_map hash_set
)
set(HAVE_STD_HASH_MAP ${HAVE_HASH_MAP})
wx_check_cxx_source_compiles("
__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
__gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;"
HAVE_EXT_HASH_MAP
ext/hash_map ext/hash_set
)
set(HAVE_GNU_CXX_HASH_MAP ${HAVE_EXT_HASH_MAP})
wx_check_cxx_source_compiles("
std::unordered_map<double*, char*> test1;
std::unordered_set<char*> test2;"
HAVE_STD_UNORDERED_MAP
unordered_map unordered_set
)
set(HAVE_STD_UNORDERED_SET ${HAVE_STD_UNORDERED_MAP})
wx_check_cxx_source_compiles("
std::tr1::unordered_map<double*, char*> test1;
std::tr1::unordered_set<char*> test2;"
HAVE_TR1_UNORDERED_MAP
tr1/unordered_map tr1/unordered_set
)
set(HAVE_TR1_UNORDERED_SET ${HAVE_TR1_UNORDERED_MAP})
# Check for availability of GCC's atomic operations builtins.
wx_check_c_source_compiles("
unsigned int value=0;

37
build/cmake/setup.h.in
View file

@ -741,43 +741,6 @@
*/
#cmakedefine VA_LIST_IS_ARRAY 1
/*
* Define if your compiler has <hash_map>
*/
#cmakedefine HAVE_HASH_MAP 1
/*
* Define if your compiler has <ext/hash_map>
*/
#cmakedefine HAVE_EXT_HASH_MAP 1
/*
* Define if your compiler has std::hash_map/hash_set
*/
#cmakedefine HAVE_STD_HASH_MAP 1
/*
* Define if your compiler has __gnu_cxx::hash_map/hash_set
*/
#cmakedefine HAVE_GNU_CXX_HASH_MAP 1
/*
* Define if your compiler has std::unordered_map
*/
#cmakedefine HAVE_STD_UNORDERED_MAP 1
/*
* Define if your compiler has std::unordered_set
*/
#cmakedefine HAVE_STD_UNORDERED_SET 1
/*
* Define if your compiler has std::tr1::unordered_map
*/
#cmakedefine HAVE_TR1_UNORDERED_MAP 1
/*
* Define if your compiler has std::tr1::unordered_set
*/
#cmakedefine HAVE_TR1_UNORDERED_SET 1
/*
* Define if the compiler supports simple visibility declarations.
*/