diff options
| author | joerg <joerg@pkgsrc.org> | 2014-08-19 13:30:39 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-08-19 13:30:39 +0000 |
| commit | 6165cef15302543c81b57267719c7dfcecfcebfc (patch) | |
| tree | 6d021335a9bff01eedfc7780f14022caa43cbacb /audio | |
| parent | f79c5230af1ca73b3cc6dd3d6f47e0eb9ff78d51 (diff) | |
| download | pkgsrc-6165cef15302543c81b57267719c7dfcecfcebfc.tar.gz | |
Redo ext/hashmap handling.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/daapd/distinfo | 4 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-types.h | 83 |
2 files changed, 36 insertions, 51 deletions
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index 8b240101dad..78317073be7 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2013/05/06 14:17:27 joerg Exp $ +$NetBSD: distinfo,v 1.24 2014/08/19 13:30:39 joerg Exp $ SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369 @@ -11,5 +11,5 @@ SHA1 (patch-af) = 1a453dde4dd7d33061a500729b9ef5d89e850133 SHA1 (patch-ag) = cf0dc389fb2a031883f52c348d8303dd36b33818 SHA1 (patch-daapd.cc) = 9107fc35ca6eb8a9841f986342781769bc29a9d2 SHA1 (patch-libhttpd_configure) = 91a7a942a078bda76582cbdf0cc1d3ae8b7029cb -SHA1 (patch-types.h) = 9ed8df565509947dbd471b26aa210d8b3ae58385 +SHA1 (patch-types.h) = b609e6e47c2dc14bb3013d75f44c6bedeae8aff5 SHA1 (patch-util.cc) = 18f0158016f56d9253459b2efe6ed528bac750c0 diff --git a/audio/daapd/patches/patch-types.h b/audio/daapd/patches/patch-types.h index 2ba408b821f..b3b9b4d745a 100644 --- a/audio/daapd/patches/patch-types.h +++ b/audio/daapd/patches/patch-types.h @@ -1,55 +1,40 @@ -$NetBSD: patch-types.h,v 1.1 2013/05/06 14:17:28 joerg Exp $ +$NetBSD: patch-types.h,v 1.2 2014/08/19 13:30:39 joerg Exp $ ---- types.h.orig 2013-05-04 14:53:09.000000000 +0000 +--- types.h.orig 2014-08-19 12:33:06.000000000 +0000 +++ types.h -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <strings.h> - #include <pthread.h> -+#include <cstdlib> - - // #include "mmgr.h" - -@@ -40,41 +41,7 @@ - - #include "dboutput.h" - #include "songcache.h" -- -- --// STL defines no hash function for std::string. --// How annoying. -- --#ifdef __GNUC__ --// gcc version < 3.1.0 ? --#if __GNUC__ < 3 || \ --(__GNUC__ == 3 && __GNUC_MINOR__ < 1) -- __STL_BEGIN_NAMESPACE -- template<> struct hash<std::string> { -- size_t operator()(std::string __s) const { +@@ -52,7 +52,7 @@ + __STL_BEGIN_NAMESPACE + template<> struct hash<std::string> { + size_t operator()(std::string __s) const { - return __stl_hash_string( (const char*) __s.c_str() ); -- } -- }; -- __STL_END_NAMESPACE --#else -- namespace __gnu_cxx { -- template<> struct hash<std::string> { -- size_t operator()(std::string __s) const { ++ return hash<const char *>()(__s.c_str()); + } + }; + __STL_END_NAMESPACE +@@ -60,7 +60,7 @@ + namespace __gnu_cxx { + template<> struct hash<std::string> { + size_t operator()(std::string __s) const { - return __stl_hash_string( (const char*) __s.c_str() ); -- } -- }; -- } --#endif // GCC_VERSION --#else -- __STL_BEGIN_NAMESPACE -- template<> struct hash<std::string> { -- size_t operator()(std::string __s) const { ++ return hash<const char *>()(__s.c_str()); + } + }; + } +@@ -69,7 +69,7 @@ + __STL_BEGIN_NAMESPACE + template<> struct hash<std::string> { + size_t operator()(std::string __s) const { - return __stl_hash_string( (const char*) __s.c_str() ); -- } -- }; -- __STL_END_NAMESPACE --#endif // __GNUC__ -- -+#include <string> ++ return hash<const char *>()(__s.c_str()); + } + }; + __STL_END_NAMESPACE +@@ -109,7 +109,7 @@ struct InitParams { + } + + ~InitParams() { +- free(dirs); ++ delete dirs; + } + }; - // database/server init parameters - struct InitParams { |