From: Dave Watson <davejwatson@fb.com>
Date: Fri, 21 Nov 2014 23:06:53 +0000 (-0800)
Subject: fix build
X-Git-Tag: v0.22.0~147
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=70109461ae4bb08fd9f99f140be70f2d33c0d8fc;p=folly.git

fix build

Summary: bad merge with D1661169 caused a unittest to fail.  Update unittest

Test Plan: fbconfig -r folly/experimental/wangle; fbmake runtests

Reviewed By: jsedgwick@fb.com

Subscribers: doug, fugalh, njormrod, folly-diffs@

FB internal diff: D1698435

Signature: t1:1698435:1416611458:555b6b50baa1bc5850b10e19c9c94978f93f2a5a
---

diff --git a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp b/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
index b8461b45..0d0d843f 100644
--- a/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
+++ b/folly/experimental/wangle/bootstrap/BootstrapTest.cpp
@@ -24,8 +24,7 @@
 using namespace folly::wangle;
 using namespace folly;
 
-typedef ChannelHandlerAdapter<IOBuf> BytesPassthrough;
-typedef ChannelPipeline<BytesPassthrough> Pipeline;
+typedef ChannelPipeline<IOBufQueue&, std::unique_ptr<IOBuf>> Pipeline;
 
 class TestServer : public ServerBootstrap<Pipeline> {
   Pipeline* newPipeline(std::shared_ptr<AsyncSocket>) {
@@ -49,7 +48,7 @@ class TestPipelineFactory : public PipelineFactory<Pipeline> {
  public:
   Pipeline* newPipeline(std::shared_ptr<AsyncSocket> sock) {
     pipelines++;
-    return new Pipeline(BytesPassthrough());
+    return new Pipeline();
   }
   std::atomic<int> pipelines{0};
 };