From e3f671034cf48710bca775a58900988c0986e6d0 Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Sat, 5 Jan 2013 20:46:43 +0100
Subject: [PATCH] THRIFT-1814 Minor D library fixes fix a few tiny issues in
 the D library so that it compiles using the upcoming 2.061 DMD release

Patch: David Nadlinger
---
 lib/d/src/thrift/codegen/base.d     | 2 +-
 lib/d/src/thrift/internal/codegen.d | 2 +-
 lib/d/test/transport_test.d         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/d/src/thrift/codegen/base.d b/lib/d/src/thrift/codegen/base.d
index d6973750..95e09ff6 100644
--- a/lib/d/src/thrift/codegen/base.d
+++ b/lib/d/src/thrift/codegen/base.d
@@ -913,7 +913,7 @@ unittest {
   // combinations. Functionality checks are covered by the rest of the test
   // suite.
 
-  struct Test {
+  static struct Test {
     // Non-nullable.
     int a1;
     int a2;
diff --git a/lib/d/src/thrift/internal/codegen.d b/lib/d/src/thrift/internal/codegen.d
index d6ce0a90..aae65bb9 100644
--- a/lib/d/src/thrift/internal/codegen.d
+++ b/lib/d/src/thrift/internal/codegen.d
@@ -201,7 +201,7 @@ template AllMemberMethodNames(T) if (isService!T) {
   ) AllMemberMethodNames;
 }
 
-private template FilterMethodNames(T, MemberNames...) {
+template FilterMethodNames(T, MemberNames...) {
   alias StaticFilter!(
     CompilesAndTrue!(
       Compose!(isSomeFunction, TypeOf, PApply!(GetMember, T))
diff --git a/lib/d/test/transport_test.d b/lib/d/test/transport_test.d
index 3f61a5d2..09bf6fd6 100644
--- a/lib/d/test/transport_test.d
+++ b/lib/d/test/transport_test.d
@@ -669,7 +669,7 @@ void main(string[] args) {
   // each send() call.  If we have more than ~400 outstanding 1-byte write
   // requests, additional send() calls start blocking.
   testRw!CoupledSocketTransports(1024 * 16, 1, 1,
-          0, 0, 400);
+          0, 0, 250);
   testRw!CoupledSocketTransports(1024 * 256, 0, 0,
           rand4k, rand4k, socketMaxOutstanding);
   testRw!CoupledSocketTransports(1024 * 256, rand4k, rand4k,
@@ -677,7 +677,7 @@ void main(string[] args) {
   testRw!CoupledSocketTransports(1024 * 256, 167, 163,
           rand4k, rand4k, socketMaxOutstanding);
   testRw!CoupledSocketTransports(1024 * 16, 1, 1,
-          rand4k, rand4k, 400);
+          rand4k, rand4k, 250);
 
   testBlocking!CoupledSocketTransports();
 
-- 
2.17.1