[llvm-commits] [llvm] r66406 - in /llvm/trunk: Makefile autoconf/configure.ac autoconf/m4/cxx_hash_map.m4 autoconf/m4/cxx_hash_set.m4 cmake/config-ix.cmake cmake/modules/CheckCxxHashmap.cmake cmake/modules/CheckCxxHashset.cmake include/llvm/ADT/HashExtras.h include/llvm/ADT/hash_map.cmake include/llvm/ADT/hash_map.h.in include/llvm/ADT/hash_set.cmake include/llvm/ADT/hash_set.h.in
Nick Lewycky
nicholas at mxc.ca
Sun Mar 8 23:16:26 PDT 2009
Author: nicholas
Date: Mon Mar 9 01:16:26 2009
New Revision: 66406
URL: http://llvm.org/viewvc/llvm-project?rev=66406&view=rev
Log:
Remove configurey-fu to autodetect hash_map and hash_set now that they are
no longer used in LLVM.
Removed:
llvm/trunk/autoconf/m4/cxx_hash_map.m4
llvm/trunk/autoconf/m4/cxx_hash_set.m4
llvm/trunk/cmake/modules/CheckCxxHashmap.cmake
llvm/trunk/cmake/modules/CheckCxxHashset.cmake
llvm/trunk/include/llvm/ADT/hash_map.cmake
llvm/trunk/include/llvm/ADT/hash_map.h.in
llvm/trunk/include/llvm/ADT/hash_set.cmake
llvm/trunk/include/llvm/ADT/hash_set.h.in
Modified:
llvm/trunk/Makefile
llvm/trunk/autoconf/configure.ac
llvm/trunk/cmake/config-ix.cmake
llvm/trunk/include/llvm/ADT/HashExtras.h
Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=66406&r1=66405&r2=66406&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Mon Mar 9 01:16:26 2009
@@ -117,8 +117,6 @@
dist-hook::
$(Echo) Eliminating files constructed by configure
$(Verb) $(RM) -f \
- $(TopDistDir)/include/llvm/ADT/hash_map.h \
- $(TopDistDir)/include/llvm/ADT/hash_set.h \
$(TopDistDir)/include/llvm/ADT/iterator.h \
$(TopDistDir)/include/llvm/Config/config.h \
$(TopDistDir)/include/llvm/Support/DataTypes.h \
@@ -137,8 +135,6 @@
FilesToConfig := \
include/llvm/Config/config.h \
include/llvm/Support/DataTypes.h \
- include/llvm/ADT/hash_map.h \
- include/llvm/ADT/hash_set.h \
include/llvm/ADT/iterator.h
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=66406&r1=66405&r2=66406&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Mon Mar 9 01:16:26 2009
@@ -842,8 +842,6 @@
dnl Check for variations in the Standard C++ library and STL. These macros are
dnl provided by LLVM in the autoconf/m4 directory.
-AC_CXX_HAVE_HASH_MAP
-AC_CXX_HAVE_HASH_SET
AC_CXX_HAVE_STD_ITERATOR
AC_CXX_HAVE_BI_ITERATOR
AC_CXX_HAVE_FWD_ITERATOR
@@ -1048,8 +1046,6 @@
dnl files can be updated automatically when their *.in sources change.
AC_CONFIG_HEADERS([include/llvm/Config/config.h])
AC_CONFIG_HEADERS([include/llvm/Support/DataTypes.h])
-AC_CONFIG_HEADERS([include/llvm/ADT/hash_map.h])
-AC_CONFIG_HEADERS([include/llvm/ADT/hash_set.h])
AC_CONFIG_HEADERS([include/llvm/ADT/iterator.h])
dnl Configure the makefile's configuration data
Removed: llvm/trunk/autoconf/m4/cxx_hash_map.m4
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/m4/cxx_hash_map.m4?rev=66405&view=auto
==============================================================================
--- llvm/trunk/autoconf/m4/cxx_hash_map.m4 (original)
+++ llvm/trunk/autoconf/m4/cxx_hash_map.m4 (removed)
@@ -1,59 +0,0 @@
-# Check for hash_map extension. This is from
-# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_map.html
-AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_MAP],
-[AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class std::hash_map],
- ac_cv_cxx_have_std_ext_hash_map,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_map>
-#ifdef HAVE_NAMESPACES
-using namespace std;
-#endif]], [[hash_map<int, int> t;]])],[ac_cv_cxx_have_std_ext_hash_map=yes],[ac_cv_cxx_have_std_ext_hash_map=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_std_ext_hash_map" = yes
- then
- AC_DEFINE(HAVE_STD_EXT_HASH_MAP,1,[Have ext/hash_map>])
- else
- AC_DEFINE(HAVE_STD_EXT_HASH_MAP,0,[Does not have ext/hash_map>])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_MAP],
-[AC_CACHE_CHECK([whether the compiler has <ext/hash_map> defining template class __gnu_cxx::hash_map],
- ac_cv_cxx_have_gnu_ext_hash_map,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_map>
-#ifdef HAVE_NAMESPACES
-using namespace __gnu_cxx;
-#endif]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_map=yes],[ac_cv_cxx_have_gnu_ext_hash_map=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_gnu_ext_hash_map" = yes
- then
- AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,1,[Have ext/hash_map])
- else
- AC_DEFINE(HAVE_GNU_EXT_HASH_MAP,0,[Does not have ext/hash_map])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_MAP],
-[AC_CACHE_CHECK([whether the compiler has <hash_map> defining template class ::hash_map],
- ac_cv_cxx_have_global_hash_map,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_map>]], [[hash_map<int,int> t; ]])],[ac_cv_cxx_have_global_hash_map=yes],[ac_cv_cxx_have_global_hash_map=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_global_hash_map" = yes
- then
- AC_DEFINE(HAVE_GLOBAL_HASH_MAP,1,[Have <hash_map>])
- else
- AC_DEFINE(HAVE_GLOBAL_HASH_MAP,0,[Does not have <hash_map>])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_HASH_MAP],
-[AC_CXX_HAVE_STD_EXT_HASH_MAP
- AC_CXX_HAVE_GNU_EXT_HASH_MAP
- AC_CXX_HAVE_GLOBAL_HASH_MAP])
-
-
Removed: llvm/trunk/autoconf/m4/cxx_hash_set.m4
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/m4/cxx_hash_set.m4?rev=66405&view=auto
==============================================================================
--- llvm/trunk/autoconf/m4/cxx_hash_set.m4 (original)
+++ llvm/trunk/autoconf/m4/cxx_hash_set.m4 (removed)
@@ -1,60 +0,0 @@
-# Check for hash_set extension. This is modified from
-# http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_have_ext_hash_set.html
-AC_DEFUN([AC_CXX_HAVE_STD_EXT_HASH_SET],
-[AC_CACHE_CHECK([whether the compiler has <ext/hash_set> defining template class std::hash_set],
- ac_cv_cxx_have_std_ext_hash_set,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
-#ifdef HAVE_NAMESPACES
-using namespace std;
-#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_std_ext_hash_set=yes],[ac_cv_cxx_have_std_ext_hash_set=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_std_ext_hash_set" = yes
- then
- AC_DEFINE(HAVE_STD_EXT_HASH_SET,1,[Have hash_set in std namespace])
- else
- AC_DEFINE(HAVE_STD_EXT_HASH_SET,0,[Does not have hash_set in std namespace])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_GNU_EXT_HASH_SET],
-[AC_CACHE_CHECK(
- [whether the compiler has <ext/hash_set> defining template class __gnu_cxx::hash_set],
- ac_cv_cxx_have_gnu_ext_hash_set,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ext/hash_set>
-#ifdef HAVE_NAMESPACES
-using namespace __gnu_cxx;
-#endif]], [[hash_set<int> t; ]])],[ac_cv_cxx_have_gnu_ext_hash_set=yes],[ac_cv_cxx_have_gnu_ext_hash_set=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_gnu_ext_hash_set" = yes
- then
- AC_DEFINE(HAVE_GNU_EXT_HASH_SET,1,[Have hash_set in gnu namespace])
- else
- AC_DEFINE(HAVE_GNU_EXT_HASH_SET,0,[Does not have hash_set in gnu namespace])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_GLOBAL_HASH_SET],
-[AC_CACHE_CHECK([whether the compiler has <hash_set> defining template class ::hash_set],
- ac_cv_cxx_have_global_hash_set,
- [AC_REQUIRE([AC_CXX_NAMESPACES])
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <hash_set>]], [[hash_set<int> t; return 0;]])],[ac_cv_cxx_have_global_hash_set=yes],[ac_cv_cxx_have_global_hash_set=no])
- AC_LANG_POP([C++])])
- if test "$ac_cv_cxx_have_global_hash_set" = yes
- then
- AC_DEFINE(HAVE_GLOBAL_HASH_SET,1,[Have hash_set in global namespace])
- else
- AC_DEFINE(HAVE_GLOBAL_HASH_SET,0,[Does not have hash_set in global namespace])
- fi
- ])
-
-AC_DEFUN([AC_CXX_HAVE_HASH_SET],
-[AC_CXX_HAVE_STD_EXT_HASH_SET
- AC_CXX_HAVE_GNU_EXT_HASH_SET
- AC_CXX_HAVE_GLOBAL_HASH_SET])
-
-
Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=66406&r1=66405&r2=66406&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Mon Mar 9 01:16:26 2009
@@ -86,14 +86,6 @@
set(LTDL_DLOPEN_DEPLIBS 0) # TODO
endif( MSVC )
-if( NOT MSVC )
- # hash_map.h.in and hash_set.h.in contain a special case for MSVC
- include(CheckCxxHashmap)
- include(CheckCxxHashset)
- check_hashmap()
- check_hashset()
-endif( NOT MSVC )
-
# FIXME: Signal handler return type, currently hardcoded to 'void'
set(RETSIGTYPE void)
@@ -124,12 +116,3 @@
${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h
)
-configure_file(
- ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_map.cmake
- ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_map.h
- )
-
-configure_file(
- ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_set.cmake
- ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_set.h
- )
Removed: llvm/trunk/cmake/modules/CheckCxxHashmap.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CheckCxxHashmap.cmake?rev=66405&view=auto
==============================================================================
--- llvm/trunk/cmake/modules/CheckCxxHashmap.cmake (original)
+++ llvm/trunk/cmake/modules/CheckCxxHashmap.cmake (removed)
@@ -1,53 +0,0 @@
-# - Check if for hash_map.
-# CHECK_HASHMAP ()
-#
-
-include(CheckCXXSourceCompiles)
-
-macro(CHECK_HASHMAP)
- message(STATUS "Checking for C++ hash_map implementation...")
- check_cxx_source_compiles("
- #include <ext/hash_map>
- int main() {
- __gnu_cxx::hash_map<int, int> t;
- }
-"
- HAVE_GNU_EXT_HASH_MAP
- )
- if(HAVE_GNU_EXT_HASH_MAP)
- message(STATUS "C++ hash_map found in 'ext' dir in namespace __gnu_cxx::")
- endif(HAVE_GNU_EXT_HASH_MAP)
-
- check_cxx_source_compiles("
- #include <ext/hash_map>
- int main() {
- std::hash_map<int, int> t;
- }
-"
- HAVE_STD_EXT_HASH_MAP
- )
- if(HAVE_STD_EXT_HASH_MAP)
- message(STATUS "C++ hash_map found in 'ext' dir in namespace std::")
- endif(HAVE_STD_EXT_HASH_MAP)
-
- check_cxx_source_compiles("
- #include <hash_map>
- int main() {
- hash_map<int, int> t;
- }
-"
- HAVE_GLOBAL_HASH_MAP
- )
- if(HAVE_GLOBAL_HASH_MAP)
- message(STATUS "C++ hash_map found in global namespace")
- endif(HAVE_GLOBAL_HASH_MAP)
-
- if(NOT HAVE_GNU_EXT_HASH_MAP)
- if(NOT HAVE_STD_EXT_HASH_MAP)
- if(NOT HAVE_GLOBAL_HASH_MAP)
- message(STATUS "C++ hash_map not found")
- endif(NOT HAVE_GLOBAL_HASH_MAP)
- endif(NOT HAVE_STD_EXT_HASH_MAP)
- endif(NOT HAVE_GNU_EXT_HASH_MAP)
-
-endmacro(CHECK_HASHMAP)
Removed: llvm/trunk/cmake/modules/CheckCxxHashset.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/CheckCxxHashset.cmake?rev=66405&view=auto
==============================================================================
--- llvm/trunk/cmake/modules/CheckCxxHashset.cmake (original)
+++ llvm/trunk/cmake/modules/CheckCxxHashset.cmake (removed)
@@ -1,52 +0,0 @@
-# - Check if for hash_set.
-# CHECK_HASHSET ()
-#
-
-include(CheckCXXSourceCompiles)
-
-macro(CHECK_HASHSET)
- message(STATUS "Checking for C++ hash_set implementation...")
- check_cxx_source_compiles("
- #include <ext/hash_set>
- int main() {
- __gnu_cxx::hash_set<int> t;
- }
-"
- HAVE_GNU_EXT_HASH_SET
- )
- if(HAVE_GNU_EXT_HASH_SET)
- message(STATUS "C++ hash_set found in 'ext' dir in namespace __gnu_cxx::")
- endif(HAVE_GNU_EXT_HASH_SET)
-
- check_cxx_source_compiles("
- #include <ext/hash_set>
- int main() {
- std::hash_set<int> t;
- }
-"
- HAVE_STD_EXT_HASH_SET
- )
- if(HAVE_STD_EXT_HASH_SET)
- message(STATUS "C++ hash_set found in 'ext' dir in namespace std::")
- endif(HAVE_STD_EXT_HASH_SET)
-
- check_cxx_source_compiles("
- #include <hash_set>
- int main() {
- hash_set<int> t;
- }
-"
- HAVE_GLOBAL_HASH_SET
- )
- if(HAVE_GLOBAL_HASH_SET)
- message(STATUS "C++ hash_set found in global namespace")
- endif(HAVE_GLOBAL_HASH_SET)
-
- if(NOT HAVE_GNU_EXT_HASH_SET)
- if(NOT HAVE_STD_EXT_HASH_SET)
- if(NOT HAVE_GLOBAL_HASH_SET)
- message(STATUS "C++ hash_set not found")
- endif(NOT HAVE_GLOBAL_HASH_SET)
- endif(NOT HAVE_STD_EXT_HASH_SET)
- endif(NOT HAVE_GNU_EXT_HASH_SET)
-endmacro(CHECK_HASHSET)
Modified: llvm/trunk/include/llvm/ADT/HashExtras.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/HashExtras.h?rev=66406&r1=66405&r2=66406&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/HashExtras.h (original)
+++ llvm/trunk/include/llvm/ADT/HashExtras.h Mon Mar 9 01:16:26 2009
@@ -17,7 +17,6 @@
#ifndef LLVM_ADT_HASHEXTRAS_H
#define LLVM_ADT_HASHEXTRAS_H
-#include "llvm/ADT/hash_map.h"
#include <string>
// Cannot specialize hash template from outside of the std namespace.
Removed: llvm/trunk/include/llvm/ADT/hash_map.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/hash_map.cmake?rev=66405&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ADT/hash_map.cmake (original)
+++ llvm/trunk/include/llvm/ADT/hash_map.cmake (removed)
@@ -1,150 +0,0 @@
-//===-- llvm/ADT/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 <hash_map> 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 LLVM_ADT_HASH_MAP
-#define LLVM_ADT_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
-// HP aCC6 std stdex/rw/hashm*ap.h
-// MS VC++ stdext hash_map
-
-#cmakedefine HAVE_GNU_EXT_HASH_MAP
-#cmakedefine HAVE_STD_EXT_HASH_MAP
-#cmakedefine HAVE_GLOBAL_HASH_MAP
-#cmakedefine HAVE_RW_STDEX_HASH_MAP_H
-
-#if defined(HAVE_GNU_EXT_HASH_MAP)
-// This is for GCC-3.1+ which puts hash in ext/hash_map
-# include <ext/hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE __gnu_cxx
-# endif
-
-// GCC 3.0.x puts hash_map in <ext/hash_map> and in the std namespace.
-#elif defined(HAVE_STD_EXT_HASH_MAP)
-# include <ext/hash_map>
-# 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 defined(HAVE_GLOBAL_HASH_MAP)
-# include <hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// HP aCC doesn't include an SGI-like hash_map. For this platform (or
-// any others using Rogue Wave Software's Tools.h++ library), we wrap
-// around them in std::
-#elif defined(HAVE_RW_STDEX_HASH_MAP_H)
-# include <rw/stdex/hashmap.h>
-# include <rw/stdex/hashmmap.h>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// Support Microsoft VC++.
-#elif defined(_MSC_VER)
-# include <hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE stdext
- using std::_Distance;
-# 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
-
-// we wrap Rogue Wave Tools.h++ rw_hashmap into something SGI-looking, here:
-#ifdef HAVE_RW_STDEX_HASH_MAP_H
-namespace HASH_NAMESPACE {
-
-template <class DataType> struct hash {
- unsigned int operator()(const unsigned int& x) const {
- return x;
- }
-};
-
-template <typename KeyType,
- typename ValueType,
- class _HashFcn = hash<KeyType>,
- class _EqualKey = equal_to<KeyType>,
- class _A = allocator <ValueType> >
-class hash_map : public rw_hashmap<KeyType, ValueType, class _HashFcn,
- class _EqualKey, class _A> {
-};
-
-template <typename KeyType,
- typename ValueType,
- class _HashFcn = hash<KeyType>,
- class _EqualKey = equal_to<KeyType>,
- class _A = allocator <ValueType> >
-class hash_multimap : public rw_hashmultimap<KeyType, ValueType, class _HashFcn,
- class _EqualKey, class _A> {
-};
-
-} // end HASH_NAMESPACE;
-#endif
-
-// Include vector because ext/hash_map includes stl_vector.h and leaves
-// out specializations like stl_bvector.h, causing link conflicts.
-#include <vector>
-
-#ifdef _MSC_VER
-
-// GCC and VC++ have differing ways of implementing hash_maps. As it's not
-// standardized, that's to be expected. This adapter class allows VC++
-// hash_map to use GCC's hash classes.
-namespace stdext {
- template<class Key> struct hash;
-
- // Provide a hash function for unsigned ints...
- template<> struct hash<unsigned int> {
- inline size_t operator()(unsigned int Val) const {
- return Val;
- }
- };
-
- template<class Key> class hash_compare<Key, std::less<Key> > {
- std::less<Key> comp;
- public:
- enum { bucket_size = 4 };
- enum { min_buckets = 8 };
- hash_compare() {}
- hash_compare(std::less<Key> pred) : comp(pred) {}
- size_t operator()(const Key& key) const { return hash<Key>()(key); }
- bool operator()(const Key& k1, const Key& k2) const { return comp(k1, k2); }
- };
-}
-
-#endif
-
-using HASH_NAMESPACE::hash_map;
-using HASH_NAMESPACE::hash_multimap;
-using HASH_NAMESPACE::hash;
-
-#include "llvm/ADT/HashExtras.h"
-
-#endif
Removed: llvm/trunk/include/llvm/ADT/hash_map.h.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/hash_map.h.in?rev=66405&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ADT/hash_map.h.in (original)
+++ llvm/trunk/include/llvm/ADT/hash_map.h.in (removed)
@@ -1,150 +0,0 @@
-//==-- llvm/ADT/hash_map.h - "Portable" wrapper around hash_map --*- C++ -*-==//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file provides a wrapper around the mysterious <hash_map> 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 LLVM_ADT_HASH_MAP_H
-#define LLVM_ADT_HASH_MAP_H
-
-// 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
-// HP aCC6 std stdex/rw/hashm*ap.h
-// MS VC++ stdext hash_map
-
-#undef HAVE_GNU_EXT_HASH_MAP
-#undef HAVE_STD_EXT_HASH_MAP
-#undef HAVE_GLOBAL_HASH_MAP
-#undef HAVE_RW_STDEX_HASH_MAP_H
-
-#if HAVE_GNU_EXT_HASH_MAP
-// This is for GCC-3.1+ which puts hash in ext/hash_map
-# include <ext/hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE __gnu_cxx
-# endif
-
-// GCC 3.0.x puts hash_map in <ext/hash_map> and in the std namespace.
-#elif HAVE_STD_EXT_HASH_MAP
-# include <ext/hash_map>
-# 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 <hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// HP aCC doesn't include an SGI-like hash_map. For this platform (or
-// any others using Rogue Wave Software's Tools.h++ library), we wrap
-// around them in std::
-#elif HAVE_RW_STDEX_HASH_MAP_H
-# include <rw/stdex/hashmap.h>
-# include <rw/stdex/hashmmap.h>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// Support Microsoft VC++.
-#elif defined(_MSC_VER)
-# include <hash_map>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE stdext
- using std::_Distance;
-# 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
-
-// we wrap Rogue Wave Tools.h++ rw_hashmap into something SGI-looking, here:
-#ifdef HAVE_RW_STDEX_HASH_MAP_H
-namespace HASH_NAMESPACE {
-
-template <class DataType> struct hash {
- unsigned int operator()(const unsigned int& x) const {
- return x;
- }
-};
-
-template <typename KeyType,
- typename ValueType,
- class _HashFcn = hash<KeyType>,
- class _EqualKey = equal_to<KeyType>,
- class _A = allocator <ValueType> >
-class hash_map : public rw_hashmap<KeyType, ValueType, class _HashFcn,
- class _EqualKey, class _A> {
-};
-
-template <typename KeyType,
- typename ValueType,
- class _HashFcn = hash<KeyType>,
- class _EqualKey = equal_to<KeyType>,
- class _A = allocator <ValueType> >
-class hash_multimap : public rw_hashmultimap<KeyType, ValueType, class _HashFcn,
- class _EqualKey, class _A> {
-};
-
-} // end HASH_NAMESPACE;
-#endif
-
-// Include vector because ext/hash_map includes stl_vector.h and leaves
-// out specializations like stl_bvector.h, causing link conflicts.
-#include <vector>
-
-#ifdef _MSC_VER
-
-// GCC and VC++ have differing ways of implementing hash_maps. As it's not
-// standardized, that's to be expected. This adapter class allows VC++
-// hash_map to use GCC's hash classes.
-namespace stdext {
- template<class Key> struct hash;
-
- // Provide a hash function for unsigned ints...
- template<> struct hash<unsigned int> {
- inline size_t operator()(unsigned int Val) const {
- return Val;
- }
- };
-
- template<class Key> class hash_compare<Key, std::less<Key> > {
- std::less<Key> comp;
- public:
- enum { bucket_size = 4 };
- enum { min_buckets = 8 };
- hash_compare() {}
- hash_compare(std::less<Key> pred) : comp(pred) {}
- size_t operator()(const Key& key) const { return hash<Key>()(key); }
- bool operator()(const Key& k1, const Key& k2) const { return comp(k1, k2); }
- };
-}
-
-#endif
-
-using HASH_NAMESPACE::hash_map;
-using HASH_NAMESPACE::hash_multimap;
-using HASH_NAMESPACE::hash;
-
-#include "llvm/ADT/HashExtras.h"
-
-#endif // LLVM_ADT_HASH_MAP_H
Removed: llvm/trunk/include/llvm/ADT/hash_set.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/hash_set.cmake?rev=66405&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ADT/hash_set.cmake (original)
+++ llvm/trunk/include/llvm/ADT/hash_set.cmake (removed)
@@ -1,111 +0,0 @@
-//===-- llvm/ADT/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 <hash_set> 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 LLVM_ADT_HASH_SET
-#define LLVM_ADT_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
-// HP aCC6 std stdex/rw/hashset.h
-// MS VC++ stdext hash_set
-
-#cmakedefine HAVE_GNU_EXT_HASH_SET
-#cmakedefine HAVE_STD_EXT_HASH_SET
-#cmakedefine HAVE_GLOBAL_HASH_SET
-#cmakedefine HAVE_RW_STDEX_HASH_SET_H
-
-// GCC versions 3.1 and later put hash_set in <ext/hash_set> and in
-// the __gnu_cxx namespace.
-#if defined(HAVE_GNU_EXT_HASH_SET)
-# include <ext/hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE __gnu_cxx
-# endif
-
-// GCC 3.0.x puts hash_set in <ext/hash_set> and in the std namespace.
-#elif defined(HAVE_STD_EXT_HASH_SET)
-# include <ext/hash_set>
-# 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 defined(HAVE_GLOBAL_HASH_SET)
-# include <hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// HP aCC doesn't include an SGI-like hash_set. For this platform (or
-// any others using Rogue Wave Software's Tools.h++ library), we wrap
-// around them in std::
-#elif defined(HAVE_RW_STDEX_HASH_SET_H)
-# include <rw/stdex/hashset.h>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// Support Microsoft VC++.
-#elif defined(_MSC_VER)
-# include <hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE stdext
-# 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
-
-// we wrap Rogue Wave Tools.h++ rw_hashset into something SGI-looking, here:
-#ifdef HAVE_RW_STDEX_HASH_SET_H
-namespace HASH_NAMESPACE {
-
-/*
-template <class DataType> struct hash {
- unsigned int operator()(const unsigned int& x) const {
- return x;
- }
-};
-*/
-
-template <typename ValueType,
- class _HashFcn = hash<ValueType>,
- class _EqualKey = equal_to<ValueType>,
- class _A = allocator <ValueType> >
-class hash_set :
- public rw_hashset<ValueType, class _HashFcn, class _EqualKey, class _A> {
-};
-
-} // end HASH_NAMESPACE;
-#endif
-
-using HASH_NAMESPACE::hash_set;
-
-// Include vector because ext/hash_set includes stl_vector.h and leaves
-// out specializations like stl_bvector.h, causing link conflicts.
-#include <vector>
-
-#include "llvm/ADT/HashExtras.h"
-
-#endif
Removed: llvm/trunk/include/llvm/ADT/hash_set.h.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/hash_set.h.in?rev=66405&view=auto
==============================================================================
--- llvm/trunk/include/llvm/ADT/hash_set.h.in (original)
+++ llvm/trunk/include/llvm/ADT/hash_set.h.in (removed)
@@ -1,111 +0,0 @@
-//==-- llvm/ADT/hash_set.h - "Portable" wrapper around hash_set --*- C++ -*-==//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file 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 <hash_set> 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 LLVM_ADT_HASH_SET_H
-#define LLVM_ADT_HASH_SET_H
-
-// 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
-// HP aCC6 std stdex/rw/hashset.h
-// MS VC++ stdext hash_set
-
-#undef HAVE_GNU_EXT_HASH_SET
-#undef HAVE_STD_EXT_HASH_SET
-#undef HAVE_GLOBAL_HASH_SET
-#undef HAVE_RW_STDEX_HASH_SET_H
-
-// GCC versions 3.1 and later put hash_set in <ext/hash_set> and in
-// the __gnu_cxx namespace.
-#if HAVE_GNU_EXT_HASH_SET
-# include <ext/hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE __gnu_cxx
-# endif
-
-// GCC 3.0.x puts hash_set in <ext/hash_set> and in the std namespace.
-#elif HAVE_STD_EXT_HASH_SET
-# include <ext/hash_set>
-# 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 <hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// HP aCC doesn't include an SGI-like hash_set. For this platform (or
-// any others using Rogue Wave Software's Tools.h++ library), we wrap
-// around them in std::
-#elif HAVE_RW_STDEX_HASH_SET_H
-# include <rw/stdex/hashset.h>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE std
-# endif
-
-// Support Microsoft VC++.
-#elif defined(_MSC_VER)
-# include <hash_set>
-# ifndef HASH_NAMESPACE
-# define HASH_NAMESPACE stdext
-# 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
-
-// we wrap Rogue Wave Tools.h++ rw_hashset into something SGI-looking, here:
-#ifdef HAVE_RW_STDEX_HASH_SET_H
-namespace HASH_NAMESPACE {
-
-/*
-template <class DataType> struct hash {
- unsigned int operator()(const unsigned int& x) const {
- return x;
- }
-};
-*/
-
-template <typename ValueType,
- class _HashFcn = hash<ValueType>,
- class _EqualKey = equal_to<ValueType>,
- class _A = allocator <ValueType> >
-class hash_set :
- public rw_hashset<ValueType, class _HashFcn, class _EqualKey, class _A> {
-};
-
-} // end HASH_NAMESPACE;
-#endif
-
-using HASH_NAMESPACE::hash_set;
-
-// Include vector because ext/hash_set includes stl_vector.h and leaves
-// out specializations like stl_bvector.h, causing link conflicts.
-#include <vector>
-
-#include "llvm/ADT/HashExtras.h"
-
-#endif // LLVM_ADT_HASH_SET_H
More information about the llvm-commits
mailing list