From: Hans Fugal <fugalh@fb.com>
Date: Fri, 10 Apr 2015 18:17:34 +0000 (-0700)
Subject: (rx) Include types.h first
X-Git-Tag: v0.36.0~44
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a01ba2448a45540caef38de902a316b2ac18c4ee;p=folly.git

(rx) Include types.h first

Summary: We need to do forward declarations first, and types.h already does declarations, so just make sure it gets included first in each file.

Test Plan:
tests

Reviewed By: davejwatson@fb.com

Subscribers: trunkagent, fugalh, exa, folly-diffs@, jsedgwick, yfeldblum

FB internal diff: D1861040

Tasks: 6258585

Signature: t1:1861040:1428604059:de6393e3c87e0694a6b04ad6d440cc9635a1008d
---

diff --git a/folly/wangle/rx/Observable.h b/folly/wangle/rx/Observable.h
index 98f6b431..b3f25564 100644
--- a/folly/wangle/rx/Observable.h
+++ b/folly/wangle/rx/Observable.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
+#include <folly/wangle/rx/types.h> // must come first
 #include <folly/wangle/rx/Subject.h>
 #include <folly/wangle/rx/Subscription.h>
-#include <folly/wangle/rx/types.h>
 
 #include <folly/RWSpinLock.h>
 #include <folly/SmallLocks.h>
diff --git a/folly/wangle/rx/Observer.h b/folly/wangle/rx/Observer.h
index 3ce94acf..e82d4e6f 100644
--- a/folly/wangle/rx/Observer.h
+++ b/folly/wangle/rx/Observer.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/wangle/rx/types.h>
+#include <folly/wangle/rx/types.h> // must come first
 #include <functional>
 #include <memory>
 #include <stdexcept>
diff --git a/folly/wangle/rx/Subject.h b/folly/wangle/rx/Subject.h
index ba66f860..c806d705 100644
--- a/folly/wangle/rx/Subject.h
+++ b/folly/wangle/rx/Subject.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <folly/wangle/rx/types.h> // must come first
 #include <folly/wangle/rx/Observable.h>
 #include <folly/wangle/rx/Observer.h>
 
diff --git a/folly/wangle/rx/Subscription.h b/folly/wangle/rx/Subscription.h
index e017f4e4..8445ccf2 100644
--- a/folly/wangle/rx/Subscription.h
+++ b/folly/wangle/rx/Subscription.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <folly/wangle/rx/types.h> // must come first
 #include <folly/wangle/rx/Observable.h>
 
 namespace folly { namespace wangle {