From 6cd52446fae6cde1bac52c9753011e00fd2d5292 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Mon, 23 Feb 2004 18:56:35 +0000 Subject: [PATCH] Renamed to hash_map.in; move to using autoconf substitution tags. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11764 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/Support/{hash_map => hash_map.in} | 8 ++- include/llvm/ADT/hash_map.in | 66 +++++++++++++++++++++++ 2 files changed, 69 insertions(+), 5 deletions(-) rename include/Support/{hash_map => hash_map.in} (93%) create mode 100644 include/llvm/ADT/hash_map.in diff --git a/include/Support/hash_map b/include/Support/hash_map.in similarity index 93% rename from include/Support/hash_map rename to include/Support/hash_map.in index de3b3f5ea5f..0253de788fe 100644 --- a/include/Support/hash_map +++ b/include/Support/hash_map.in @@ -25,9 +25,7 @@ // 3.1 __gnu_cxx ext/hash_map // -#include "Config/config.h" - -#ifdef HAVE_GNU_EXT_HASH_MAP +#if @HAVE_GNU_EXT_HASH_MAP@ // This is for GCC-3.1+ which puts hash in ext/hash_map # include # ifndef HASH_NAMESPACE @@ -35,7 +33,7 @@ # endif // GCC 3.0.x puts hash_map in and in the std namespace. -#elif defined(HAVE_STD_EXT_HASH_MAP) +#elif @HAVE_STD_EXT_HASH_MAP@ # include # ifndef HASH_NAMESPACE # define HASH_NAMESPACE std @@ -43,7 +41,7 @@ // Older compilers such as GCC before version 3.0 do not keep // extensions in the `ext' directory, and ignore the `std' namespace. -#elif defined(HAVE_GLOBAL_HASH_MAP) +#elif @HAVE_GLOBAL_HASH_MAP@ # include # ifndef HASH_NAMESPACE # define HASH_NAMESPACE std diff --git a/include/llvm/ADT/hash_map.in b/include/llvm/ADT/hash_map.in new file mode 100644 index 00000000000..0253de788fe --- /dev/null +++ b/include/llvm/ADT/hash_map.in @@ -0,0 +1,66 @@ +//===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===// +// +// The LLVM Compiler Infrastructure +// +// This file was developed by the LLVM research group and is distributed under +// the University of Illinois Open Source License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file provides a wrapper around the mysterious header file +// that seems to move around between GCC releases into and out of namespaces at +// will. #including this header will cause hash_map to be available in the +// global namespace. +// +//===----------------------------------------------------------------------===// + +#ifndef SUPPORT_HASH_MAP +#define SUPPORT_HASH_MAP + +// Compiler Support Matrix +// +// Version Namespace Header File +// 2.95.x :: hash_map +// 3.0.4 std ext/hash_map +// 3.1 __gnu_cxx ext/hash_map +// + +#if @HAVE_GNU_EXT_HASH_MAP@ +// This is for GCC-3.1+ which puts hash in ext/hash_map +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE __gnu_cxx +# endif + +// GCC 3.0.x puts hash_map in and in the std namespace. +#elif @HAVE_STD_EXT_HASH_MAP@ +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE std +# endif + +// Older compilers such as GCC before version 3.0 do not keep +// extensions in the `ext' directory, and ignore the `std' namespace. +#elif @HAVE_GLOBAL_HASH_MAP@ +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE std +# endif + +// Give a warning if we couldn't find it, instead of (or in addition to) +// randomly doing something dumb. +#else +# warning "Autoconfiguration failed to find the hash_map header file." +#endif + +using HASH_NAMESPACE::hash_map; +using HASH_NAMESPACE::hash_multimap; +using HASH_NAMESPACE::hash; + +// Include vector because ext/hash_map includes stl_vector.h and leaves +// out specializations like stl_bvector.h, causing link conflicts. +#include + +#include + +#endif