$NetBSD: patch-src_misc_dxcc.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $ Avoid implicit conversions to bool for streams. Require C++11 for Clang and prefer std version over tr1 when in C++11 mode. --- src/misc/dxcc.cxx.orig 2013-05-03 14:21:04.000000000 +0000 +++ src/misc/dxcc.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -43,8 +42,16 @@ #include "confdialog.h" #include "main.h" +#if __cplusplus >= 201103L +#include +using std::unordered_map; +#else +#include +using std::tr1::unordered_map; +#endif + using namespace std; -using tr1::unordered_map; + dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz)