diff options
author | Karl Berry <karl@freefriends.org> | 2014-04-27 22:38:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-04-27 22:38:18 +0000 |
commit | 55e45a0d588de0392d2198753e45d75cd58f9e4d (patch) | |
tree | 358fbf59150b403df32a1cdce8203a6a430df110 /Build/source/utils/asymptote/memory.h | |
parent | 7aca5de4dcd646af709f86123599cdcb45d6445f (diff) |
asy 2.26 sources
git-svn-id: svn://tug.org/texlive/trunk@33703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/memory.h')
-rw-r--r-- | Build/source/utils/asymptote/memory.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Build/source/utils/asymptote/memory.h b/Build/source/utils/asymptote/memory.h index 9bbbfd17530..495bed6c123 100644 --- a/Build/source/utils/asymptote/memory.h +++ b/Build/source/utils/asymptote/memory.h @@ -14,19 +14,32 @@ #include <string> #include <sstream> -#ifndef __GNUC_PREREQ -#define __GNUC_PREREQ(maj, min) (0) +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define PREREQ(maj,min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define PREREQ(maj,min) 1 #endif #ifndef NOHASH -#if __GNUC_PREREQ(4,3) || defined(__CYGWIN__) +#if PREREQ(4,3) || defined(__CYGWIN__) + +#if __cplusplus >= 201103L +#include <memory> +#include <unordered_map> +#define EXT std +#else #include <tr1/unordered_map> #define EXT std::tr1 +#endif + #else + #define EXT __gnu_cxx #include <ext/hash_map> #define unordered_map hash_map #define unordered_multimap hash_multimap + #endif #endif |