Make fbstring libgcc-safe

[folly.git] / folly / String.h

diff --git a/folly/String.h b/folly/String.h
index b8ee9f39e50a66857d666438175bdd9a35b430c0..d59477f05440e578928a9605e14257a56487545b 100644 (file)
--- a/folly/String.h
+++ b/folly/String.h
@@ -21,10 +21,12 @@
 #include <string>
 #include <boost/type_traits.hpp>
 
+#ifdef FOLLY_HAVE_DEPRECATED_ASSOC
 #ifdef _GLIBCXX_SYMVER
 #include <ext/hash_set>
 #include <ext/hash_map>
 #endif
+#endif
 
 #include <unordered_set>
 #include <unordered_map>
@@ -518,6 +520,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> {
 
 }
 
+#if FOLLY_HAVE_DEPRECATED_ASSOC
 #if defined(_GLIBCXX_SYMVER) && !defined(__BIONIC__)
 namespace __gnu_cxx {
 
@@ -530,6 +533,7 @@ struct hash<std::basic_string<C> > : private hash<const C*> {
 
 }
 #endif
+#endif
 
 // Hook into boost's type traits
 namespace boost {