mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
43 lines
1.1 KiB
C++
43 lines
1.1 KiB
C++
$NetBSD: patch-src_spot_spot.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/spot/spot.cxx.orig 2013-05-03 14:37:33.000000000 +0000
|
|
+++ src/spot/spot.cxx
|
|
@@ -23,7 +23,6 @@
|
|
#include <config.h>
|
|
|
|
#include <list>
|
|
-#include <tr1/unordered_map>
|
|
#include <functional>
|
|
|
|
#include "trx.h"
|
|
@@ -33,6 +32,13 @@
|
|
#include "debug.h"
|
|
#include "spot.h"
|
|
|
|
+#if __cplusplus >= 201103L
|
|
+#include <unordered_map>
|
|
+#else
|
|
+#include <tr1/unordered_map>
|
|
+using std::tr1::unordered_map;
|
|
+#endif
|
|
+
|
|
// the number of characters that we match our REs against
|
|
#define SEARCHLEN 32
|
|
#define DECBUFSIZE 8 * SEARCHLEN
|
|
@@ -60,9 +66,9 @@ struct fre_comp : std::unary_function<co
|
|
};
|
|
|
|
typedef list<callback_t*> callback_p_list_t;
|
|
-typedef tr1::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
|
|
+typedef unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
|
|
|
|
-static tr1::unordered_map<int, string> buffers;
|
|
+static unordered_map<int, string> buffers;
|
|
static cblist_t cblist;
|
|
static rcblist_t rcblist;
|
|
|