From 95f6a93c2b20058953a28084fae28d7c6aedc2a2 Mon Sep 17 00:00:00 2001 From: Hans Fugal Date: Wed, 29 Oct 2014 11:30:02 -0700 Subject: [PATCH] move clang disable of Thens.cpp to thens.rb Summary: So when we re-generate code we don't cause clang test failures (until #4412111 is done) Test Plan: git diff Reviewed By: jsedgwick@fb.com Subscribers: net-systems@, fugalh, mathieubaudet, exa, njormrod, folly-diffs@ FB internal diff: D1644550 Tasks: 4412111 Signature: t1:1644550:1414604128:8184e7ce1f3e417c170ef67346d553caecc1f013 --- folly/wangle/test/Thens.cpp | 6 +++--- folly/wangle/test/thens.rb | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/folly/wangle/test/Thens.cpp b/folly/wangle/test/Thens.cpp index 268d36b2..a0e1be32 100644 --- a/folly/wangle/test/Thens.cpp +++ b/folly/wangle/test/Thens.cpp @@ -1,9 +1,9 @@ // This file is @generated by thens.rb -#include - -#ifndef __clang__ // TODO: fails to compile with clang:dev. See task #4412111 +#ifndef __clang__ + +#include TEST(Future, thenVariants) { SomeClass anObject; diff --git a/folly/wangle/test/thens.rb b/folly/wangle/test/thens.rb index 942096c3..e45b2c31 100755 --- a/folly/wangle/test/thens.rb +++ b/folly/wangle/test/thens.rb @@ -1,5 +1,7 @@ #!/usr/bin/env ruby +# ruby thens.rb > Thens.cpp + # An exercise in combinatorics. # (ordinary/static function, member function, std::function, lambda) # X @@ -59,7 +61,10 @@ tests = ( ).map {|a| test(a)}.flatten print < @@ -69,4 +74,6 @@ TEST(Future, thenVariants) { #{tests.join("\n ")} } + +#endif EOF -- 2.34.1