diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-23 16:59:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-23 16:59:46 +0000 |
| commit | ff810db8f20202a2fd55ca0129c47439c83e6ece (patch) | |
| tree | 55217403274b388e6236487af2afecf7e973abb6 | |
| parent | d9e0d07fc9416c456bbd05d34031c6f9ce9e7e14 (diff) | |
| download | pkgsrc-ff810db8f20202a2fd55ca0129c47439c83e6ece.tar.gz | |
Fix GCC 3.4+ by making the friend declaration an explicit template.
| -rw-r--r-- | comms/gsmlib/distinfo | 3 | ||||
| -rw-r--r-- | comms/gsmlib/patches/patch-ab | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/comms/gsmlib/distinfo b/comms/gsmlib/distinfo index 005d1fcbeb6..38dd93037c5 100644 --- a/comms/gsmlib/distinfo +++ b/comms/gsmlib/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 16:05:29 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/12/23 16:59:46 joerg Exp $ SHA1 (gsmlib-1.10.tar.gz) = 0f329f6185c0dd5221f85ee0af7d95dea23bed8f RMD160 (gsmlib-1.10.tar.gz) = 8abd1cdb4b61ddbb6fffd3a4100edcc0f079b845 Size (gsmlib-1.10.tar.gz) = 474591 bytes SHA1 (patch-aa) = 9b86282d92c91bdc017f6966471de4b3621cf8b5 +SHA1 (patch-ab) = 62f236e4fc130a4c8ecaab50d84043006366b3bb diff --git a/comms/gsmlib/patches/patch-ab b/comms/gsmlib/patches/patch-ab new file mode 100644 index 00000000000..ec6942018b8 --- /dev/null +++ b/comms/gsmlib/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 2005/12/23 16:59:46 joerg Exp $ + +--- gsmlib/gsm_map_key.h.orig 2002-05-14 19:38:12.000000000 +0000 ++++ gsmlib/gsm_map_key.h +@@ -45,20 +45,12 @@ namespace gsmlib + MapKey(SortedStore &myStore, string key) : + _myStore(myStore), _strKey(key) {} + +- friend +- bool operator< +-#ifndef WIN32 +- <> +-#endif +- (const MapKey<SortedStore> &x, +- const MapKey<SortedStore> &y); +- friend +- bool operator== +-#ifndef WIN32 +- <> +-#endif +- (const MapKey<SortedStore> &x, +- const MapKey<SortedStore> &y); ++ template <class _SortedStore> friend ++ bool operator<(const MapKey<_SortedStore> &x, ++ const MapKey<_SortedStore> &y); ++ template <class _SortedStore> friend ++ bool operator==(const MapKey<_SortedStore> &x, ++ const MapKey<_SortedStore> &y); + }; + + // compare two keys |