Re: CVS commit: pkgsrc/games/criticalmass

[David Holland <dholland-pkgchanges%netbsd.org@localhost>]

On Sun, Jun 16, 2013 at 08:40:40PM +0000, Joerg Sonnenberger wrote:
 > Modified Files:
 >      pkgsrc/games/criticalmass: distinfo
 >      pkgsrc/games/criticalmass/patches: patch-utils_ResourceManager.cpp
 > Added Files:
 >      pkgsrc/games/criticalmass/patches: patch-game_BitmapManager.cpp
 >          patch-game_CallbackManager.cpp patch-game_CallbackManager.hpp
 >          patch-game_FontManager.cpp patch-game_Input.cpp
 >          patch-game_Input.hpp patch-game_ModelManager.cpp
 >          patch-game_ModelManager.hpp patch-game_ParticleGroup.cpp
 >          patch-game_ParticleGroup.hpp patch-game_ParticleGroupManager.hpp
 >          patch-game_SampleManager.cpp patch-game_SelectableFactory.cpp
 >          patch-game_SelectableFactory.hpp patch-game_WeaponDepot.cpp
 >          patch-game_WeaponDepot.hpp patch-tools_Packer.cpp
 >          patch-utils_Config.cpp patch-utils_Config.hpp
 >          patch-utils_FindHash.hpp patch-utils_ResourceCache.hpp
 >          patch-utils_ResourceManager.hpp
 >          patch-utilsgl_GLBitmapCollection.hpp
 > 
 > Log Message:
 > Disambiguate hash references.

Unfortunately, in gcc I now get:

ResourceManager.cpp: In member function 'int
  ResourceManager::getResourceSize(const std::string&)':
ResourceManager.cpp:200:54: error: call of overloaded 'findHash(const
  std::string&, __gnu_cxx::hash_map<const std::basic_string<char>,
  DirectoryEntry*, __gnu_cxx::hash<const std::basic_string<char> >,
  std::equal_to<const std::basic_string<char> > >&)' is ambiguous
./FindHash.hpp:19:8: note: candidates are: _ValT* findHash(_KeyT&,
  __gnu_cxx::hash_map<_KeyT, _ValT*, __gnu_cxx::hash<_Key>,
  std::equal_to<_Key> >&) [with _KeyT = const std::basic_string<char>,
  _ValT = DirectoryEntry]
./FindHash.hpp:49:8: note:                 _ValT* findHash(const
  _KeyT&, __gnu_cxx::hash_map<const _KeyT, _ValT*, __gnu_cxx::hash<const
  _KeyT> >&) [with _KeyT = std::basic_string<char>, _ValT =
  DirectoryEntry]
ResourceManager.cpp: In member function 'bool
  ResourceManager::selectResource(const std::string&)':
ResourceManager.cpp:247:51: error: call of overloaded 'findHash(const
  std::string&, __gnu_cxx::hash_map<const std::basic_string<char>,
  DirectoryEntry*, __gnu_cxx::hash<const std::basic_string<char> >,
  std::equal_to<const std::basic_string<char> > >&)' is ambiguous
./FindHash.hpp:19:8: note: candidates are: _ValT* findHash(_KeyT&,
  __gnu_cxx::hash_map<_KeyT, _ValT*, __gnu_cxx::hash<_Key>,
  std::equal_to<_Key> >&) [with _KeyT = const std::basic_string<char>,
  _ValT = DirectoryEntry]
./FindHash.hpp:49:8: note:                 _ValT* findHash(const
  _KeyT&, __gnu_cxx::hash_map<const _KeyT, _ValT*, __gnu_cxx::hash<const
  _KeyT> >&) [with _KeyT = std::basic_string<char>, _ValT =
  DirectoryEntry]

-- 
David A. Holland
dholland%netbsd.org@localhost