head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.98
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.96
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.94
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.92
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.90
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.88
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.86
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.84
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.82
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.80
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.78
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.76
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.74
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.72
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.70
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.68
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.66
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.64
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.62
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.60
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.58
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.56
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.54
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.50
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.30
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.52
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.48
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.46
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.44
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.42
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.40
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.38
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.36
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.34
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.32
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.28
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.26
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.24
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.22
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.20
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.18
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.16
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.14
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.12
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.10
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.8
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.6
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.4
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.2
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.01.06.17.08.20;	author dholland;	state Exp;
branches;
next	1.1;
commitid	FBFNrHVBZNMMW4kx;

1.1
date	2013.06.16.20.40.40;	author joerg;	state Exp;
branches;
next	;
commitid	rSVAtlXmtaCdGSTw;


desc
@@


1.2
log
@Adjust joerg's patches in a way that fixes the gcc build and hopefully
doesn't rebreak the clang build. (sigh, C++)
@
text
@$NetBSD: patch-utils_FindHash.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $
Incomplete.

--- utils/FindHash.hpp.orig	2005-09-11 23:21:57.000000000 +0000
+++ utils/FindHash.hpp
@@@@ -18,9 +18,9 @@@@
 template< class _KeyT, class _ValT >
 _ValT* findHash( 
     _KeyT &trigger, 
-    hash_map< _KeyT, _ValT*, hash<_KeyT>, equal_to<_KeyT> > & hashMap )
+    hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT>, equal_to<_KeyT> > & hashMap )
 {
-    typename hash_map< _KeyT, _ValT*, hash<_KeyT> >::const_iterator ci;
+    typename hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT> >::const_iterator ci;
     ci = hashMap.find( trigger);
     if( ci == hashMap.end())
     {
@@@@ -33,9 +33,9 @@@@ _ValT* findHash( 
 template< class _KeyT, class _ValT >
 _ValT* findHash( 
     const _KeyT &trigger, 
-    hash_map< _KeyT, _ValT*, hash<_KeyT>, equal_to<_KeyT> > & hashMap )
+    hash_map< _KeyT, _ValT*, ::HASH_NAMESPACE::hash<_KeyT>, equal_to<_KeyT> > & hashMap )
 {
-    typename hash_map< const _KeyT, _ValT*, hash<const _KeyT> >::const_iterator ci;
+    typename hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT> >::const_iterator ci;
     ci = hashMap.find( trigger);
     if( ci == hashMap.end())
     {
@@@@ -45,4 +45,21 @@@@ _ValT* findHash( 
     return ci->second;
 }
 
+#ifdef __clang__
+template< class _KeyT, class _ValT >
+_ValT* findHash( 
+    const _KeyT &trigger, 
+    hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT>, equal_to<const _KeyT> > & hashMap )
+{
+    typename hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT> >::const_iterator ci;
+    ci = hashMap.find( trigger);
+    if( ci == hashMap.end())
+    {
+        return 0;
+    }
+
+    return ci->second;
+}
+#endif
+
 #endif
@


1.1
log
@Disambiguate hash references.
@
text
@d1 1
a1 2
$NetBSD$

d4 1
a4 1
--- utils/FindHash.hpp.orig	2013-04-30 12:15:10.000000000 +0000
d18 1
a18 1
@@@@ -33,9 +33,24 @@@@ _ValT* findHash( 
d27 14
d49 1
d51 1
a51 9
+template< class _KeyT, class _ValT >
+_ValT* findHash( 
+    const _KeyT &trigger, 
+    hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT>, equal_to<const _KeyT> > & hashMap )
+{
+    typename hash_map< const _KeyT, _ValT*, ::HASH_NAMESPACE::hash<const _KeyT> >::const_iterator ci;
     ci = hashMap.find( trigger);
     if( ci == hashMap.end())
     {
@