Prefer C++11 interfaces over tr1.


(joerg)

$NetBSD: patch-src_bin_compile-main.h,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/bin/compile-main.h.orig	2013-05-03 17:26:20.000000000 +0000
+++ src/bin/compile-main.h
@@ -22,8 +22,15 @@
 #ifndef FST_COMPILE_MAIN_H__
 #define FST_COMPILE_MAIN_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
 #include <sstream>
 #include <string>
 #include <vector>

$NetBSD: patch-src_include_fst_config.h.in,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/include/fst/config.h.in.orig	2013-05-03 17:47:24.000000000 +0000
+++ src/include/fst/config.h.in
@@ -2,7 +2,7 @@
 
 /* Define to 1 if the system has the type `std::tr1::hash<long long
    unsigned>'. */
-#define HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_ 1
+#undef HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_
 
 /* Define to 1 if the system has the type `__gnu_cxx::slist<int>'. */
-#define HAVE___GNU_CXX__SLIST_INT_ 1
+#undef HAVE___GNU_CXX__SLIST_INT_

$NetBSD: patch-src_include_fst_encode.h,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/include/fst/encode.h.orig	2013-05-03 17:23:12.000000000 +0000
+++ src/include/fst/encode.h
@@ -20,8 +20,15 @@
 #ifndef FST_LIB_ENCODE_H__
 #define FST_LIB_ENCODE_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
 #include <string>
 #include <vector>
 #include <fst/map.h>

$NetBSD: patch-src_include_fst_epsnormalize.h,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/include/fst/epsnormalize.h.orig	2013-05-03 17:30:15.000000000 +0000
+++ src/include/fst/epsnormalize.h
@@ -20,8 +20,16 @@
 #ifndef FST_LIB_EPSNORMALIZE_H__
 #define FST_LIB_EPSNORMALIZE_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
+
 #include <fst/slist.h>
 
 #include <fst/factor-weight.h>

$NetBSD: patch-src_include_fst_equivalent.h,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/include/fst/equivalent.h.orig	2013-05-03 17:31:26.000000000 +0000
+++ src/include/fst/equivalent.h
@@ -22,8 +22,15 @@
 
 #include <algorithm>
 #include <deque>
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
 #include <utility>
 #include <vector>
 #include <fst/encode.h>

$NetBSD: patch-src_include_fst_relabel.h,v 1.1 2013/05/06 14:53:16 joerg Exp $

--- src/include/fst/relabel.h.orig	2013-05-03 17:35:08.000000000 +0000
+++ src/include/fst/relabel.h
@@ -20,8 +20,15 @@
 #ifndef FST_LIB_RELABEL_H__
 #define FST_LIB_RELABEL_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
 #include <string>
 #include <utility>
 #include <vector>

$NetBSD: patch-src_include_fst_rmepsilon.h,v 1.1 2013/05/06 14:53:17 joerg Exp $

--- src/include/fst/rmepsilon.h.orig	2013-05-03 17:30:43.000000000 +0000
+++ src/include/fst/rmepsilon.h
@@ -20,8 +20,15 @@
 #ifndef FST_LIB_RMEPSILON_H__
 #define FST_LIB_RMEPSILON_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_map>
+using std::unordered_map;
+#else
 #include <tr1/unordered_map>
 using std::tr1::unordered_map;
+#endif
 #include <fst/slist.h>
 #include <stack>
 #include <string>

$NetBSD: patch-src_include_fst_rmfinalepsilon.h,v 1.1 2013/05/06 14:53:17 joerg Exp $

--- src/include/fst/rmfinalepsilon.h.orig	2013-05-03 17:24:31.000000000 +0000
+++ src/include/fst/rmfinalepsilon.h
@@ -20,8 +20,15 @@
 #ifndef FST_LIB_RMFINALEPSILON_H__
 #define FST_LIB_RMFINALEPSILON_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_set>
+using std::unordered_set;
+#else
 #include <tr1/unordered_set>
 using std::tr1::unordered_set;
+#endif
 #include <vector>
 
 #include <fst/connect.h>

$NetBSD: patch-src_include_fst_slist.h,v 1.1 2013/05/06 14:53:17 joerg Exp $

--- src/include/fst/slist.h.orig	2013-05-03 17:49:34.000000000 +0000
+++ src/include/fst/slist.h
@@ -47,7 +47,7 @@ template <typename T> class slist : publ
 
   iterator erase_after(iterator pos) {
     iterator npos = pos;
-    erase(++npos);
+    this->erase(++npos);
     return pos;
   }
 };

$NetBSD: patch-src_include_fst_test-properties.h,v 1.1 2013/05/06 14:53:17 joerg Exp $

--- src/include/fst/test-properties.h.orig	2013-05-03 17:21:06.000000000 +0000
+++ src/include/fst/test-properties.h
@@ -20,8 +20,15 @@
 #ifndef FST_LIB_TEST_PROPERTIES_H__
 #define FST_LIB_TEST_PROPERTIES_H__
 
+#include <ciso646>
+
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+#include <unordered_set>
+using std::unordered_set;
+#else
 #include <tr1/unordered_set>
 using std::tr1::unordered_set;
+#endif
 #include <fst/mutable-fst.h>
 #include <fst/dfs-visit.h>
 #include <fst/connect.h>