OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

66 lines
2.3 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../gsmlib/compile.patch
  5. # Copyright (C) 2004 - 2006 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. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Accumulated compile fixes. cassert since gcc-3.3 and the template reordering
  17. since gcc-3.4.
  18. - Juergen G. Sawinsiki <>
  19. - Rene Rebe <rene@exactcode.de>
  20. --- gsmlib-1.10/gsmlib/gsm_unix_serial.h~ 2002-09-22 13:51:10.000000000 +0200
  21. +++ gsmlib-1.10/gsmlib/gsm_unix_serial.h 2004-03-14 04:16:26.000000000 +0100
  22. @@ -13,6 +13,7 @@
  23. #ifndef GSM_UNIX_SERIAL_H
  24. #define GSM_UNIX_SERIAL_H
  25. +#include <cassert>
  26. #include <string>
  27. #include <gsmlib/gsm_error.h>
  28. #include <gsmlib/gsm_port.h>
  29. --- gsmlib-1.10/gsmlib/gsm_map_key.h~ 2002-05-14 21:38:12.000000000 +0200
  30. +++ gsmlib-1.10/gsmlib/gsm_map_key.h 2004-12-29 21:10:45.991761416 +0100
  31. @@ -25,6 +25,16 @@
  32. // wrapper for map key, can access Sortedtore to get sortOrder()
  33. + template <class SortedStore> class MapKey;
  34. +
  35. + // compare two keys
  36. + template <class SortedStore>
  37. + extern bool operator<(const MapKey<SortedStore> &x,
  38. + const MapKey<SortedStore> &y);
  39. + template <class SortedStore>
  40. + extern bool operator==(const MapKey<SortedStore> &x,
  41. + const MapKey<SortedStore> &y);
  42. +
  43. template <class SortedStore> class MapKey
  44. {
  45. SortedStore &_myStore; // my store
  46. @@ -61,14 +71,6 @@
  47. const MapKey<SortedStore> &y);
  48. };
  49. - // compare two keys
  50. - template <class SortedStore>
  51. - extern bool operator<(const MapKey<SortedStore> &x,
  52. - const MapKey<SortedStore> &y);
  53. - template <class SortedStore>
  54. - extern bool operator==(const MapKey<SortedStore> &x,
  55. - const MapKey<SortedStore> &y);
  56. -
  57. // MapKey members
  58. template <class SortedStore>