Switch to gnustl with rtti

Required for compiling with greco3 code.
Added -gnustl-rtti suffix to distinguish from stlport libs
Reverted changes added for stlport.

Bug: 7484202
Change-Id: Ib69db7117821f97133cadaae0f45b4e8ed2fda01

6 files changed, 10 insertions, 10 deletions

diff --git a/src/include/fst/extensions/pdt/collection.h b/src/include/fst/extensions/pdt/collection.h
index 24a443f..7cc6dd8 100644
--- a/src/include/fst/extensions/pdt/collection.h
+++ b/src/include/fst/extensions/pdt/collection.h
@@ -107,7 +107,7 @@ class Collection {
  private:
   static const I kNoNodeId;
   static const size_t kPrime;
-  static std::hash<T> hash_;
+  static std::tr1::hash<T> hash_;
 
   NodeTable node_table_;
 
@@ -118,7 +118,7 @@ template<class I, class T> const I Collection<I, T>::kNoNodeId = -1;
 
 template <class I, class T> const size_t Collection<I, T>::kPrime = 7853;
 
-template <class I, class T> std::hash<T> Collection<I, T>::hash_;
+template <class I, class T> std::tr1::hash<T> Collection<I, T>::hash_;
 
 }  // namespace fst
 
diff --git a/src/include/fst/extensions/pdt/info.h b/src/include/fst/extensions/pdt/info.h
index 55e76c4..bcadcac 100644
--- a/src/include/fst/extensions/pdt/info.h
+++ b/src/include/fst/extensions/pdt/info.h
@@ -21,10 +21,10 @@
 #ifndef FST_EXTENSIONS_PDT_INFO_H__
 #define FST_EXTENSIONS_PDT_INFO_H__
 
-#include <unordered_map>
+#include <tr1/unordered_map>
 using std::tr1::unordered_map;
 using std::tr1::unordered_multimap;
-#include <unordered_set>
+#include <tr1/unordered_set>
 using std::tr1::unordered_set;
 using std::tr1::unordered_multiset;
 #include <vector>
diff --git a/src/include/fst/extensions/pdt/paren.h b/src/include/fst/extensions/pdt/paren.h
index a9d30c5..d8cc037 100644
--- a/src/include/fst/extensions/pdt/paren.h
+++ b/src/include/fst/extensions/pdt/paren.h
@@ -23,10 +23,10 @@
 #define FST_EXTENSIONS_PDT_PAREN_H_
 
 #include <algorithm>
-#include <unordered_map>
+#include <tr1/unordered_map>
 using std::tr1::unordered_map;
 using std::tr1::unordered_multimap;
-#include <unordered_set>
+#include <tr1/unordered_set>
 using std::tr1::unordered_set;
 using std::tr1::unordered_multiset;
 #include <set>
diff --git a/src/include/fst/extensions/pdt/pdt.h b/src/include/fst/extensions/pdt/pdt.h
index 171541f..6649f55 100644
--- a/src/include/fst/extensions/pdt/pdt.h
+++ b/src/include/fst/extensions/pdt/pdt.h
@@ -21,7 +21,7 @@
 #ifndef FST_EXTENSIONS_PDT_PDT_H__
 #define FST_EXTENSIONS_PDT_PDT_H__
 
-#include <unordered_map>
+#include <tr1/unordered_map>
 using std::tr1::unordered_map;
 using std::tr1::unordered_multimap;
 #include <map>
diff --git a/src/include/fst/extensions/pdt/reverse.h b/src/include/fst/extensions/pdt/reverse.h
index b20e1c5..de67b4e 100644
--- a/src/include/fst/extensions/pdt/reverse.h
+++ b/src/include/fst/extensions/pdt/reverse.h
@@ -21,7 +21,7 @@
 #ifndef FST_EXTENSIONS_PDT_REVERSE_H__
 #define FST_EXTENSIONS_PDT_REVERSE_H__
 
-#include <unordered_map>
+#include <tr1/unordered_map>
 using std::tr1::unordered_map;
 using std::tr1::unordered_multimap;
 #include <vector>
diff --git a/src/include/fst/extensions/pdt/shortest-path.h b/src/include/fst/extensions/pdt/shortest-path.h
index 85f94b8..82fb13a 100644
--- a/src/include/fst/extensions/pdt/shortest-path.h
+++ b/src/include/fst/extensions/pdt/shortest-path.h
@@ -25,10 +25,10 @@
 #include <fst/extensions/pdt/paren.h>
 #include <fst/extensions/pdt/pdt.h>
 
-#include <unordered_map>
+#include <tr1/unordered_map>
 using std::tr1::unordered_map;
 using std::tr1::unordered_multimap;
-#include <unordered_set>
+#include <tr1/unordered_set>
 using std::tr1::unordered_set;
 using std::tr1::unordered_multiset;
 #include <stack>