Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / ham / fldigi / patches / patch-src_misc_dxcc.cxx
blob36fcffb4f38c3e39eaa02001ea31f5141a717099
1 $NetBSD$
3 --- src/misc/dxcc.cxx.orig 2013-05-03 14:21:04.000000000 +0000
4 +++ src/misc/dxcc.cxx
5 @@ -30,7 +30,6 @@
6 #include <string>
7 #include <list>
8 #include <map>
9 -#include <tr1/unordered_map>
10 #include <algorithm>
12 #include <FL/filename.H>
13 @@ -43,8 +42,16 @@
14 #include "confdialog.h"
15 #include "main.h"
17 +#if __cplusplus >= 201103L
18 +#include <unordered_map>
19 +using std::unordered_map;
20 +#else
21 +#include <tr1/unordered_map>
22 +using std::tr1::unordered_map;
23 +#endif
25 using namespace std;
26 -using tr1::unordered_map;
30 dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz)