From: Nicholas Ormrod <njormrod@fb.com>
Date: Fri, 11 Oct 2013 22:33:07 +0000 (-0700)
Subject: Migrating folly to gcc-4.7.1
X-Git-Tag: v0.22.0~828
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d7562b8c3378fedc0434a89d5000438675b56d0a;p=folly.git

Migrating folly to gcc-4.7.1

Summary:
folly/PLATFORM is the last fbcode platform on gcc-4.6.2.

Before pushing, I ran arc unit from my devserver (see Test Plan).
Phabricator's test run has a lot of aborted test cases, which are
indicative of a failing test framework. Arc unit had been
intermittently broken when running my own tests. Overriding
Phabricator's unit test failures:
@override-unit-failures

Test Plan:
(1) fbconfig -r folly/ -- build and runtsts in dbg and opt.

Everything is passing.

(2) arc unit, look at each failed result

Some builds/tests are failing. Most seem unrelated. Of the rest, one is
also failing on master, and the others did not fail during a second run.

Reviewed By: andrei.alexandrescu@fb.com

FB internal diff: D1005889
---

diff --git a/folly/FBString.h b/folly/FBString.h
index c99bb4ad..bde4e735 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -105,6 +105,10 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 
+// FBString cannot use throw when replacing std::string, though it may still
+// use std::__throw_*
+#define throw
+
 #ifdef _LIBSTDCXX_FBSTRING
 namespace std _GLIBCXX_VISIBILITY(default) {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
@@ -2422,6 +2426,7 @@ struct hash< ::folly::fbstring> {
 #endif // _LIBSTDCXX_FBSTRING
 
 #undef FBSTRING_DISABLE_ADDRESS_SANITIZER
+#undef throw
 #undef FBSTRING_LIKELY
 #undef FBSTRING_UNLIKELY