From: Brian Watling <bwatling@fb.com>
Date: Wed, 10 Dec 2014 22:39:53 +0000 (-0800)
Subject: Fix clang compilation
X-Git-Tag: v0.22.0~112
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df5336c83204367a3dfbe0ab223c9fe61395931a;p=folly.git

Fix clang compilation

Summary: Fix shadowed variable name

Test Plan: compile

Reviewed By: mmandal@fb.com

Subscribers: fugalh, mathieubaudet, folly-diffs@

FB internal diff: D1732033

Signature: t1:1732033:1418250864:d460fea376ac93c05b86977629b95dac60b8b916
---

diff --git a/folly/experimental/wangle/rx/Observable.h b/folly/experimental/wangle/rx/Observable.h
index cf75208d..7a914696 100644
--- a/folly/experimental/wangle/rx/Observable.h
+++ b/folly/experimental/wangle/rx/Observable.h
@@ -94,9 +94,9 @@ class Observable {
     // helper class.
     struct ViaSubject : public Observable<T>
     {
-      ViaSubject(SchedulerPtr scheduler,
+      ViaSubject(SchedulerPtr sched,
                  Observable* obs)
-        : scheduler_(scheduler), observable_(obs)
+        : scheduler_(sched), observable_(obs)
       {}
 
       Subscription<T> subscribe(ObserverPtr<T> o) override {