maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* If std::tr1::unordered_set is unavailable, use std::set.

Browse source
This commit is contained in:
Eelco Dolstra 2010-10-04 16:16:19 +00:00
parent 36a23e86b6
commit 95f4f2cf61
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -140,11 +140,18 @@ AC_LANG_POP(C++)
AC_CHECK_HEADER([err.h], [], [bsddiff_compat_include="-Icompat-include"]) AC_CHECK_HEADER([err.h], [], [bsddiff_compat_include="-Icompat-include"])
AC_SUBST([bsddiff_compat_include]) AC_SUBST([bsddiff_compat_include])
# Check whether we have the personality() syscall, which allows us to # Check whether we have the personality() syscall, which allows us to
# do i686-linux builds on x86_64-linux machines. # do i686-linux builds on x86_64-linux machines.
AC_CHECK_HEADERS([sys/personality.h]) AC_CHECK_HEADERS([sys/personality.h])
# Check for tr1/unordered_set.
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS([tr1/unordered_set], [], [], [])
AC_LANG_POP(C++)
AC_DEFUN([NEED_PROG], AC_DEFUN([NEED_PROG],
[ [
AC_PATH_PROG($1, $2) AC_PATH_PROG($1, $2)

9
src/libexpr/symbol-table.hh
View file

@ -1,8 +1,13 @@
#ifndef __SYMBOL_TABLE_H #ifndef __SYMBOL_TABLE_H
#define __SYMBOL_TABLE_H #define __SYMBOL_TABLE_H
#include "config.h"
#include <map> #include <map>
#if HAVE_TR1_UNORDERED_SET
#include <tr1/unordered_set> #include <tr1/unordered_set>
#endif
#include "types.hh" #include "types.hh"
@ -60,7 +65,11 @@ inline std::ostream & operator << (std::ostream & str, const Symbol & sym)
class SymbolTable class SymbolTable
{ {
private: private:
#if HAVE_TR1_UNORDERED_SET
typedef std::tr1::unordered_set<string> Symbols; typedef std::tr1::unordered_set<string> Symbols;
#else
typedef std::set<string> Symbols;
#endif
Symbols symbols; Symbols symbols;
public: public: