diff options
| author | dholland <dholland> | 2014-01-06 17:08:20 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2014-01-06 17:08:20 +0000 |
| commit | f5dc4e52104e8ce214c1a2fccdfba625b4ad74b1 (patch) | |
| tree | 73721e9ff4b9d234e946132d332f84c0795d884e /games | |
| parent | 396e7744b8cd649fb8b393d5f98a760f77b046ee (diff) | |
| download | pkgsrc-f5dc4e52104e8ce214c1a2fccdfba625b4ad74b1.tar.gz | |
Adjust joerg's patches in a way that fixes the gcc build and hopefully
doesn't rebreak the clang build. (sigh, C++)
Diffstat (limited to 'games')
| -rw-r--r-- | games/criticalmass/distinfo | 4 | ||||
| -rw-r--r-- | games/criticalmass/patches/patch-utils_FindHash.hpp | 32 |
2 files changed, 21 insertions, 15 deletions
diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo index 506dd602da6..2b2e5bda4c2 100644 --- a/games/criticalmass/distinfo +++ b/games/criticalmass/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2013/06/16 20:40:40 joerg Exp $ +$NetBSD: distinfo,v 1.12 2014/01/06 17:08:20 dholland Exp $ SHA1 (CriticalMass-1.0.2.tar.bz2) = d2d1f35183e9fbed76fd8da2a948745a4c89f20b RMD160 (CriticalMass-1.0.2.tar.bz2) = 6c0b6988f6a52c4b19fbca2525b1daec0202693d @@ -26,7 +26,7 @@ SHA1 (patch-tinyxml_tinyxmlparser.cpp) = 236ff1cbd6fe83045df28022a6b02f9f65da4ee SHA1 (patch-tools_Packer.cpp) = 06f2ce956fd627ef2293c3650238996b3f800d4c SHA1 (patch-utils_Config.cpp) = 9f146ad01fbea62270a20c5f9ed5a1e70a6c60ce SHA1 (patch-utils_Config.hpp) = c2bdaceef30711421c0c77ad680d01cb062f16a9 -SHA1 (patch-utils_FindHash.hpp) = b98aac8e4008adeb51fa9c0d3a08d10b44633b4f +SHA1 (patch-utils_FindHash.hpp) = 0164c7b802be3fa50dcfcd0545a8d56743762d1e SHA1 (patch-utils_ResourceCache.hpp) = e127f87ae94e6f9260f130bb22cdb92a8650d496 SHA1 (patch-utils_ResourceManager.cpp) = 3234b06c4b5a448aba2e3902deaba501033af88f SHA1 (patch-utils_ResourceManager.hpp) = 8f29cfb3bf2aa1844f5987abddf854594b229f5c diff --git a/games/criticalmass/patches/patch-utils_FindHash.hpp b/games/criticalmass/patches/patch-utils_FindHash.hpp index 2092d1d9125..d7a9dc31b0e 100644 --- a/games/criticalmass/patches/patch-utils_FindHash.hpp +++ b/games/criticalmass/patches/patch-utils_FindHash.hpp @@ -1,8 +1,7 @@ -$NetBSD: patch-utils_FindHash.hpp,v 1.1 2013/06/16 20:40:40 joerg Exp $ - +$NetBSD: patch-utils_FindHash.hpp,v 1.2 2014/01/06 17:08:20 dholland Exp $ Incomplete. ---- utils/FindHash.hpp.orig 2013-04-30 12:15:10.000000000 +0000 +--- utils/FindHash.hpp.orig 2005-09-11 23:21:57.000000000 +0000 +++ utils/FindHash.hpp @@ -18,9 +18,9 @@ template< class _KeyT, class _ValT > @@ -16,7 +15,7 @@ Incomplete. ci = hashMap.find( trigger); if( ci == hashMap.end()) { -@@ -33,9 +33,24 @@ _ValT* findHash( +@@ -33,9 +33,9 @@ _ValT* findHash( template< class _KeyT, class _ValT > _ValT* findHash( const _KeyT &trigger, @@ -25,6 +24,20 @@ Incomplete. { - 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()) + { @@ -33,13 +46,6 @@ Incomplete. + + return ci->second; +} ++#endif + -+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()) - { + #endif |