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.

39 lines
1.6 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/valentin/kismet/gcc34.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -ruN kismet-2004-04-R1/packet.h kismet-2004-04-R1-new/packet.h
  20. --- kismet-2004-04-R1/packet.h 2004-04-02 18:53:36.000000000 +0200
  21. +++ kismet-2004-04-R1-new/packet.h 2004-05-24 13:58:03.682859328 +0200
  22. @@ -550,7 +550,7 @@
  23. // This isn't quite like STL iterators, because I'm too damned lazy to deal with all
  24. // the nasty STL hoop-jumping. This does provide a somewhat-stl-ish interface to
  25. // iterating through the singleton and masked maps
  26. - friend class iterator {
  27. + class iterator {
  28. friend class macmap;
  29. public:
  30. @@ -643,6 +643,7 @@
  31. int vector_itr;
  32. macmap<T> *owner;
  33. };
  34. + friend class iterator;
  35. iterator begin() {
  36. iterator ret(this);