- up to 0.57.0

[packages/folly.git] / gcc5.patch

From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
Date: Wed, 27 May 2015 13:30:08 +0100
Subject: [PATCH] Fix forward declaration of basic_string and list, for dual
 abi libstdc++ with inline std::__cxx11 namespace.

Closes facebook/folly#213
Closes facebook/folly#208
---
 folly/Traits.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/folly/Traits.h b/folly/Traits.h
index 309157c..a279c02 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -19,6 +19,9 @@
 #ifndef FOLLY_BASE_TRAITS_H_
 #define FOLLY_BASE_TRAITS_H_
 
+#include <list>
+#include <string>
+
 #include <memory>
 #include <limits>
 #include <type_traits>
@@ -239,19 +242,10 @@ FOLLY_NAMESPACE_STD_BEGIN
 
 template <class T, class U>
   struct pair;
-#ifndef _GLIBCXX_USE_FB
-template <class T, class R, class A>
-  class basic_string;
-#else
-template <class T, class R, class A, class S>
-  class basic_string;
-#endif
 template <class T, class A>
   class vector;
 template <class T, class A>
   class deque;
-template <class T, class A>
-  class list;
 template <class T, class C, class A>
   class set;
 template <class K, class V, class C, class A>