standard_policies.hpp: Remove.
2012-12-03 Benjamin Kosnik <bkoz@redhat.com> * include/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp: Remove. * include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp: Remove. * include/Makefile.am (pb_headers): Remove include files. * include/Makefile.in: Regenerated. From-SVN: r194107
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
a07c4054c2
commit
cef1bc586c
|
|
@ -1,3 +1,12 @@
|
|||
2012-12-03 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp:
|
||||
Remove.
|
||||
* include/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp:
|
||||
Remove.
|
||||
* include/Makefile.am (pb_headers): Remove include files.
|
||||
* include/Makefile.in: Regenerated.
|
||||
|
||||
2012-12-01 John David Anglin <dave.anglin@nrc-cnrc.gc.ca>
|
||||
|
||||
PR libstdc++/55503
|
||||
|
|
|
|||
|
|
@ -313,8 +313,7 @@ pb_headers2 = \
|
|||
${pb_srcdir}/detail/cc_hash_table_map_/resize_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/standard_policies.hpp
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp
|
||||
|
||||
pb_headers3 = \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/trace_fn_imps.hpp \
|
||||
|
|
@ -344,7 +343,6 @@ pb_headers3 = \
|
|||
${pb_srcdir}/detail/gp_hash_table_map_/resize_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/standard_policies.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/trace_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/hash_fn/direct_mask_range_hashing_imp.hpp \
|
||||
${pb_srcdir}/detail/hash_fn/direct_mod_range_hashing_imp.hpp \
|
||||
|
|
@ -1107,7 +1105,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
|
|||
visibility=`cat stamp-visibility` ;\
|
||||
externtemplate=`cat stamp-extern-template` ;\
|
||||
ldbl_compat='s,g,g,' ;\
|
||||
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
|
||||
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
|
||||
${CONFIG_HEADER} > /dev/null 2>&1 \
|
||||
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
|
||||
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
|
||||
|
|
@ -1121,7 +1119,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
|
|||
-e 's/VERSION/_GLIBCXX_VERSION/g' \
|
||||
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \
|
||||
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
|
||||
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
|
||||
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
|
||||
< ${CONFIG_HEADER} >> $@ ;\
|
||||
echo "" >> $@ ;\
|
||||
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
|
||||
|
|
|
|||
|
|
@ -572,8 +572,7 @@ pb_headers2 = \
|
|||
${pb_srcdir}/detail/cc_hash_table_map_/resize_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/standard_policies.hpp
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/size_fn_imps.hpp
|
||||
|
||||
pb_headers3 = \
|
||||
${pb_srcdir}/detail/cc_hash_table_map_/trace_fn_imps.hpp \
|
||||
|
|
@ -603,7 +602,6 @@ pb_headers3 = \
|
|||
${pb_srcdir}/detail/gp_hash_table_map_/resize_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/standard_policies.hpp \
|
||||
${pb_srcdir}/detail/gp_hash_table_map_/trace_fn_imps.hpp \
|
||||
${pb_srcdir}/detail/hash_fn/direct_mask_range_hashing_imp.hpp \
|
||||
${pb_srcdir}/detail/hash_fn/direct_mod_range_hashing_imp.hpp \
|
||||
|
|
@ -1509,7 +1507,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
|
|||
visibility=`cat stamp-visibility` ;\
|
||||
externtemplate=`cat stamp-extern-template` ;\
|
||||
ldbl_compat='s,g,g,' ;\
|
||||
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
|
||||
grep "^[ ]*#[ ]*define[ ][ ]*_GLIBCXX_LONG_DOUBLE_COMPAT[ ][ ]*1[ ]*$$" \
|
||||
${CONFIG_HEADER} > /dev/null 2>&1 \
|
||||
&& ldbl_compat='s,^#undef _GLIBCXX_LONG_DOUBLE_COMPAT$$,#define _GLIBCXX_LONG_DOUBLE_COMPAT 1,' ;\
|
||||
sed -e "s,define __GLIBCXX__,define __GLIBCXX__ $$date," \
|
||||
|
|
@ -1523,7 +1521,7 @@ ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
|
|||
-e 's/VERSION/_GLIBCXX_VERSION/g' \
|
||||
-e 's/WORDS_/_GLIBCXX_WORDS_/g' \
|
||||
-e 's/ICONV_CONST/_GLIBCXX_ICONV_CONST/g' \
|
||||
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
|
||||
-e '/[ ]_GLIBCXX_LONG_DOUBLE_COMPAT[ ]/d' \
|
||||
< ${CONFIG_HEADER} >> $@ ;\
|
||||
echo "" >> $@ ;\
|
||||
echo "#endif // _GLIBCXX_CXX_CONFIG_H" >> $@
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
// -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the terms
|
||||
// of the GNU General Public License as published by the Free Software
|
||||
// Foundation; either version 3, or (at your option) any later
|
||||
// version.
|
||||
|
||||
// This library is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
|
||||
// Under Section 7 of GPL version 3, you are granted additional
|
||||
// permissions described in the GCC Runtime Library Exception, version
|
||||
// 3.1, as published by the Free Software Foundation.
|
||||
|
||||
// You should have received a copy of the GNU General Public License and
|
||||
// a copy of the GCC Runtime Library Exception along with this program;
|
||||
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
|
||||
|
||||
// Permission to use, copy, modify, sell, and distribute this software
|
||||
// is hereby granted without fee, provided that the above copyright
|
||||
// notice appears in all copies, and that both that copyright notice
|
||||
// and this permission notice appear in supporting documentation. None
|
||||
// of the above authors, nor IBM Haifa Research Laboratories, make any
|
||||
// representation about the suitability of this software for any
|
||||
// purpose. It is provided "as is" without express or implied
|
||||
// warranty.
|
||||
|
||||
/**
|
||||
* @file cc_hash_table_map_/standard_policies.hpp
|
||||
* Contains standard policies for cc_ht_map types.
|
||||
*/
|
||||
|
||||
#ifndef PB_DS_CC_HT_MAP_STANDARD_POLICIES_HPP
|
||||
#define PB_DS_CC_HT_MAP_STANDARD_POLICIES_HPP
|
||||
|
||||
#include <ext/pb_ds/detail/standard_policies.hpp>
|
||||
|
||||
#endif // #ifndef PB_DS_CC_HT_MAP_STANDARD_POLICIES_HPP
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
// -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the terms
|
||||
// of the GNU General Public License as published by the Free Software
|
||||
// Foundation; either version 3, or (at your option) any later
|
||||
// version.
|
||||
|
||||
// This library is distributed in the hope that it will be useful, but
|
||||
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// General Public License for more details.
|
||||
|
||||
// Under Section 7 of GPL version 3, you are granted additional
|
||||
// permissions described in the GCC Runtime Library Exception, version
|
||||
// 3.1, as published by the Free Software Foundation.
|
||||
|
||||
// You should have received a copy of the GNU General Public License and
|
||||
// a copy of the GCC Runtime Library Exception along with this program;
|
||||
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// Copyright (C) 2004 Ami Tavory and Vladimir Dreizin, IBM-HRL.
|
||||
|
||||
// Permission to use, copy, modify, sell, and distribute this software
|
||||
// is hereby granted without fee, provided that the above copyright
|
||||
// notice appears in all copies, and that both that copyright notice
|
||||
// and this permission notice appear in supporting documentation. None
|
||||
// of the above authors, nor IBM Haifa Research Laboratories, make any
|
||||
// representation about the suitability of this software for any
|
||||
// purpose. It is provided "as is" without express or implied
|
||||
// warranty.
|
||||
|
||||
/**
|
||||
* @file gp_hash_table_map_/standard_policies.hpp
|
||||
* Contains standard policies for gp_ht_map types.
|
||||
*/
|
||||
|
||||
#ifndef PB_DS_GP_HT_MAP_STANDARD_POLICIES_HPP
|
||||
#define PB_DS_GP_HT_MAP_STANDARD_POLICIES_HPP
|
||||
|
||||
#include <ext/pb_ds/detail/standard_policies.hpp>
|
||||
#include <ext/pb_ds/ht_load_check_resize_trigger.hpp>
|
||||
#include <ext/pb_ds/linear_probe_fn.hpp>
|
||||
#include <ext/pb_ds/quadratic_probe_fn.hpp>
|
||||
|
||||
namespace __gnu_pbds
|
||||
{
|
||||
namespace detail
|
||||
{
|
||||
template<typename Comb_Probe_Fn>
|
||||
struct default_probe_fn
|
||||
{
|
||||
private:
|
||||
typedef typename Comb_Probe_Fn::size_type size_type;
|
||||
|
||||
public:
|
||||
typedef
|
||||
typename __conditional_type<
|
||||
is_same<
|
||||
__gnu_pbds::direct_mask_range_hashing<std::size_t>,
|
||||
Comb_Probe_Fn>::value,
|
||||
__gnu_pbds::linear_probe_fn<size_type>,
|
||||
__gnu_pbds::quadratic_probe_fn<size_type> >::__type
|
||||
type;
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
} // namespace __gnu_pbds
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue