diff options
| author | Diane Bruce <db@FreeBSD.org> | 2014-03-31 03:30:22 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2014-03-31 03:30:22 +0000 |
| commit | 4865fd8dafb09ce2932e9caac5c87c8eae90b58b (patch) | |
| tree | 0ad24cb33fcb8d633dd74a7120fc29fd718d04de /comms/fldigi/files/patch-src_misc_dxcc.cxx | |
| parent | - Fix STR2CSTR usage [1] (diff) | |
- Update to latest release
=Version 3.21.81=
2014-03-26 David Freese <w1hkj@w1hkj.com>
134221e: TX monitor
922c16f: Spotter seg fault
dbe4181: Audio selectors for PORTAUDIO
9771f4b: M4 tr1 detect
03643a6: ttyACMxx identification
cfe6f87: Olivia critical section
a60d6f7: MT63 critical section
c97043c: Logbook fields
3bc4f31: Hamlib selector
d33b7e7: Combobox
6f71f12: RTTY macro
ac671da: clang compatibility
Notes
Notes:
svn path=/head/; revision=349700
Diffstat (limited to 'comms/fldigi/files/patch-src_misc_dxcc.cxx')
| -rw-r--r-- | comms/fldigi/files/patch-src_misc_dxcc.cxx | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/comms/fldigi/files/patch-src_misc_dxcc.cxx b/comms/fldigi/files/patch-src_misc_dxcc.cxx deleted file mode 100644 index 56d168186bee..000000000000 --- a/comms/fldigi/files/patch-src_misc_dxcc.cxx +++ /dev/null @@ -1,25 +0,0 @@ ---- src/misc/dxcc.cxx.orig 2013-05-14 05:06:28.000000000 -0400 -+++ src/misc/dxcc.cxx 2013-11-20 18:19:33.406394129 -0500 -@@ -30,7 +30,7 @@ - #include <string> - #include <list> - #include <map> --#include <tr1/unordered_map> -+#include <unordered_map> - #include <algorithm> - - #include <FL/filename.H> -@@ -44,8 +44,11 @@ - #include "main.h" - - using namespace std; --using tr1::unordered_map; -- -+//#ifdef __clang__ -+using std::unordered_map; -+//#else -+//using tr1::unordered_map; -+//#endif - - dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz) - : country(cn), cq_zone(cq), itu_zone(itu), latitude(lat), longitude(lon), gmt_offset(tz) |