ham/fldigi/patches/patch-src_spot_spot.cxx

   1 $NetBSD$
   2
   3 --- src/spot/spot.cxx.orig      2013-05-03 14:37:33.000000000 +0000
   4 +++ src/spot/spot.cxx
   5 @@ -23,7 +23,6 @@
   6  #include <config.h>
   7
   8  #include <list>
   9 -#include <tr1/unordered_map>
  10  #include <functional>
  11
  12  #include "trx.h"
  13 @@ -33,6 +32,13 @@
  14  #include "debug.h"
  15  #include "spot.h"
  16
  17 +#if __cplusplus >= 201103L
  18 +#include <unordered_map>
  19 +#else
  20 +#include <tr1/unordered_map>
  21 +using std::tr1::unordered_map;
  22 +#endif
  23 +
  24  // the number of characters that we match our REs against
  25  #define SEARCHLEN 32
  26  #define DECBUFSIZE 8 * SEARCHLEN
  27 @@ -60,9 +66,9 @@ struct fre_comp : std::unary_function<co
  28  };
  29
  30  typedef list<callback_t*> callback_p_list_t;
  31 -typedef tr1::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
  32 +typedef unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
  33
  34 -static tr1::unordered_map<int, string> buffers;
  35 +static unordered_map<int, string> buffers;
  36  static cblist_t cblist;
  37  static rcblist_t rcblist;
  38