From 55e45a0d588de0392d2198753e45d75cd58f9e4d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Apr 2014 22:38:18 +0000 Subject: asy 2.26 sources git-svn-id: svn://tug.org/texlive/trunk@33703 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/utils/asymptote/memory.h | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'Build/source/utils/asymptote/memory.h') 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 #include -#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 +#include +#define EXT std +#else #include #define EXT std::tr1 +#endif + #else + #define EXT __gnu_cxx #include #define unordered_map hash_map #define unordered_multimap hash_multimap + #endif #endif -- cgit v1.2.3