From cbc20b451d3a3980351c388652ea39314dd09a23 Mon Sep 17 00:00:00 2001 From: Brian Gaeke Date: Mon, 23 Feb 2004 18:56:36 +0000 Subject: [PATCH] Renamed to hash_set.in; move to using autoconf substitution tags. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11765 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/Support/{hash_set => hash_set.in} | 8 +-- include/llvm/ADT/hash_set.in | 67 +++++++++++++++++++++++ 2 files changed, 70 insertions(+), 5 deletions(-) rename include/Support/{hash_set => hash_set.in} (93%) create mode 100644 include/llvm/ADT/hash_set.in diff --git a/include/Support/hash_set b/include/Support/hash_set.in similarity index 93% rename from include/Support/hash_set rename to include/Support/hash_set.in index fa68a8bb738..49c5d732e8f 100644 --- a/include/Support/hash_set +++ b/include/Support/hash_set.in @@ -26,18 +26,16 @@ // 3.1 __gnu_cxx ext/hash_set // -#include "Config/config.h" - // GCC versions 3.1 and later put hash_set in and in // the __gnu_cxx namespace. -#if defined(HAVE_GNU_EXT_HASH_SET) +#if @HAVE_GNU_EXT_HASH_SET@ # include # ifndef HASH_NAMESPACE # define HASH_NAMESPACE __gnu_cxx # endif // GCC 3.0.x puts hash_set in and in the std namespace. -#elif defined(HAVE_STD_EXT_HASH_SET) +#elif @HAVE_STD_EXT_HASH_SET@ # include # ifndef HASH_NAMESPACE # define HASH_NAMESPACE std @@ -45,7 +43,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_SET) +#elif @HAVE_GLOBAL_HASH_SET@ # include # ifndef HASH_NAMESPACE # define HASH_NAMESPACE std diff --git a/include/llvm/ADT/hash_set.in b/include/llvm/ADT/hash_set.in new file mode 100644 index 00000000000..49c5d732e8f --- /dev/null +++ b/include/llvm/ADT/hash_set.in @@ -0,0 +1,67 @@ +//===-- Support/hash_set - "Portable" wrapper around hash_set ---*- 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. +// +//===----------------------------------------------------------------------===// +// vim:ft=cpp +// +// 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_set to be available in the +// global namespace. +// +//===----------------------------------------------------------------------===// + +#ifndef SUPPORT_HASH_SET +#define SUPPORT_HASH_SET + +// Compiler Support Matrix +// +// Version Namespace Header File +// 2.95.x :: hash_set +// 3.0.4 std ext/hash_set +// 3.1 __gnu_cxx ext/hash_set +// + +// GCC versions 3.1 and later put hash_set in and in +// the __gnu_cxx namespace. +#if @HAVE_GNU_EXT_HASH_SET@ +# include +# ifndef HASH_NAMESPACE +# define HASH_NAMESPACE __gnu_cxx +# endif + +// GCC 3.0.x puts hash_set in and in the std namespace. +#elif @HAVE_STD_EXT_HASH_SET@ +# 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_SET@ +# 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_set header file." +#endif + +using HASH_NAMESPACE::hash_set; +using HASH_NAMESPACE::hash; + +// Include vector because ext/hash_set includes stl_vector.h and leaves +// out specializations like stl_bvector.h, causing link conflicts. +#include + +#include + +#endif -- 2.34.1