Skip to content

Commit

Permalink
Migrating folly to gcc-4.7.1
Browse files Browse the repository at this point in the history
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: [email protected]

FB internal diff: D1005889
  • Loading branch information
Gownta authored and sgolemon committed Oct 24, 2013
1 parent de0fe30 commit d7562b8
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions folly/FBString.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -2422,6 +2426,7 @@ struct hash< ::folly::fbstring> {
#endif // _LIBSTDCXX_FBSTRING

#undef FBSTRING_DISABLE_ADDRESS_SANITIZER
#undef throw
#undef FBSTRING_LIKELY
#undef FBSTRING_UNLIKELY

Expand Down

0 comments on commit d7562b8

Please sign in to comment.