alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do use of tr1::unordered_map with G++ 4.0.0.

Browse source 
* m4/stl.m4 (AC_HEADER_TR1_UNORDERED_MAP): Add some code so
we don't pick a broken tr1::unordered_map.
This commit is contained in:
Alexandre Duret-Lutz 2012-01-12 18:40:40 +01:00
parent 253e38ae7d
commit 89279d9829
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-01-12 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Do use of tr1::unordered_map with G++ 4.0.0.
* m4/stl.m4 (AC_HEADER_TR1_UNORDERED_MAP): Add some code so
we don't pick a broken tr1::unordered_map.
2012-01-06 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2012-01-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* lrde-upload.sh: Retrieve the package version from configure.ac. * lrde-upload.sh: Retrieve the package version from configure.ac.

6
m4/stl.m4
View file

@ -23,7 +23,11 @@ AC_DEFUN([AC_HEADER_TR1_UNORDERED_MAP], [
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -Werror" CXXFLAGS="$CXXFLAGS -Werror"
AC_TRY_COMPILE([#include <tr1/unordered_map>], [using std::tr1::unordered_map;], # GCC 4.0.0 has tr1/unordered_map, but it fails to compile the following code
AC_TRY_COMPILE([#include <tr1/unordered_map>],
[using std::tr1::unordered_map;
const unordered_map<int, int> t;
return t.find(42) == t.end();],
[ac_cv_cxx_tr1_unordered_map=yes], [ac_cv_cxx_tr1_unordered_map=no]) [ac_cv_cxx_tr1_unordered_map=yes], [ac_cv_cxx_tr1_unordered_map=no])
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
AC_LANG_RESTORE AC_LANG_RESTORE