package/network/gsmlib/hotfix.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../gsmlib/compile.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 Accumulated compile fixes. cassert since gcc-3.3 and the template reordering
  18 since gcc-3.4.
  19
  20   - Juergen G. Sawinsiki <>
  21   - Rene Rebe <rene@exactcode.de>
  22
  23 --- gsmlib-1.10/gsmlib/gsm_unix_serial.h~       2002-09-22 13:51:10.000000000 +0200
  24 +++ gsmlib-1.10/gsmlib/gsm_unix_serial.h        2004-03-14 04:16:26.000000000 +0100
  25 @@ -13,6 +13,7 @@
  26  #ifndef GSM_UNIX_SERIAL_H
  27  #define GSM_UNIX_SERIAL_H
  28
  29 +#include <cassert>
  30  #include <string>
  31  #include <gsmlib/gsm_error.h>
  32  #include <gsmlib/gsm_port.h>
  33 --- gsmlib-1.10/gsmlib/gsm_map_key.h~   2002-05-14 21:38:12.000000000 +0200
  34 +++ gsmlib-1.10/gsmlib/gsm_map_key.h    2004-12-29 21:10:45.991761416 +0100
  35 @@ -25,6 +25,16 @@
  36
  37    // wrapper for map key, can access Sortedtore to get sortOrder()
  38
  39 +  template <class SortedStore> class MapKey;
  40 +
  41 +  // compare two keys
  42 +  template <class SortedStore>
  43 +    extern bool operator<(const MapKey<SortedStore> &x,
  44 +                          const MapKey<SortedStore> &y);
  45 +  template <class SortedStore>
  46 +    extern bool operator==(const MapKey<SortedStore> &x,
  47 +                           const MapKey<SortedStore> &y);
  48 +
  49    template <class SortedStore> class MapKey
  50    {
  51      SortedStore &_myStore;   // my store
  52 @@ -61,14 +71,6 @@
  53                         const MapKey<SortedStore> &y);
  54    };
  55
  56 -  // compare two keys
  57 -  template <class SortedStore>
  58 -    extern bool operator<(const MapKey<SortedStore> &x,
  59 -                          const MapKey<SortedStore> &y);
  60 -  template <class SortedStore>
  61 -    extern bool operator==(const MapKey<SortedStore> &x,
  62 -                           const MapKey<SortedStore> &y);
  63 -
  64    // MapKey members
  65
  66    template <class SortedStore>