From 4c010707c5aeeae6300a2931dc02c0a14e2e141a Mon Sep 17 00:00:00 2001 From: Hans Fugal Date: Thu, 30 Oct 2014 16:20:17 -0700 Subject: [PATCH] (wangle-test) fix double ifndef in thens.rb Summary: Looks like a bad git merge Test Plan: builds Reviewed By: hannesr@fb.com Subscribers: hannesr, net-systems@, fugalh, exa, njormrod, folly-diffs@ FB internal diff: D1649773 Tasks: 5501131 Signature: t1:1649773:1414700920:cc691283884e9654803bba3ffe78f4553194752d --- folly/wangle/test/Thens.cpp | 3 --- folly/wangle/test/thens.rb | 3 --- 2 files changed, 6 deletions(-) diff --git a/folly/wangle/test/Thens.cpp b/folly/wangle/test/Thens.cpp index 2a9cdca1..f990678d 100644 --- a/folly/wangle/test/Thens.cpp +++ b/folly/wangle/test/Thens.cpp @@ -5,9 +5,6 @@ #include -#ifndef __clang__ -// TODO: fails to compile with clang:dev. See task #4412111 - TEST(Future, thenVariants) { SomeClass anObject; Executor* anExecutor; diff --git a/folly/wangle/test/thens.rb b/folly/wangle/test/thens.rb index 7de0e4cc..9c753725 100755 --- a/folly/wangle/test/thens.rb +++ b/folly/wangle/test/thens.rb @@ -68,9 +68,6 @@ print < -#ifndef __clang__ -// TODO: fails to compile with clang:dev. See task #4412111 - TEST(Future, thenVariants) { SomeClass anObject; Executor* anExecutor; -- 2.34.1