mirror of the now-defunct rocklinux.org
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.

44 lines
1.4 KiB

  1. --- gsmlib-1.10/gsmlib/gsm_unix_serial.h~ 2002-09-22 13:51:10.000000000 +0200
  2. +++ gsmlib-1.10/gsmlib/gsm_unix_serial.h 2004-03-14 04:16:26.000000000 +0100
  3. @@ -13,6 +13,7 @@
  4. #ifndef GSM_UNIX_SERIAL_H
  5. #define GSM_UNIX_SERIAL_H
  6. +#include <cassert>
  7. #include <string>
  8. #include <gsmlib/gsm_error.h>
  9. #include <gsmlib/gsm_port.h>
  10. --- gsmlib-1.10/gsmlib/gsm_map_key.h.orig Wed May 15 04:38:12 2002
  11. +++ gsmlib-1.10/gsmlib/gsm_map_key.h Wed Aug 18 22:19:20 2004
  12. @@ -25,6 +25,16 @@
  13. // wrapper for map key, can access Sortedtore to get sortOrder()
  14. + template <class SortedStore> class MapKey;
  15. +
  16. + // compare two keys
  17. + template <class SortedStore>
  18. + extern bool operator<(const MapKey<SortedStore> &x,
  19. + const MapKey<SortedStore> &y);
  20. + template <class SortedStore>
  21. + extern bool operator==(const MapKey<SortedStore> &x,
  22. + const MapKey<SortedStore> &y);
  23. +
  24. template <class SortedStore> class MapKey
  25. {
  26. SortedStore &_myStore; // my store
  27. @@ -61,14 +71,6 @@
  28. const MapKey<SortedStore> &y);
  29. };
  30. - // compare two keys
  31. - template <class SortedStore>
  32. - extern bool operator<(const MapKey<SortedStore> &x,
  33. - const MapKey<SortedStore> &y);
  34. - template <class SortedStore>
  35. - extern bool operator==(const MapKey<SortedStore> &x,
  36. - const MapKey<SortedStore> &y);
  37. -
  38. // MapKey members
  39. template <class SortedStore>