(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 98f6b431cf022ed9e51f1d606e6303f745137130..b3f25564318878cb995692abd3a90aeff3b5c3a9 100644 (file)
--- 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 3ce94acfcd8af2894613332ebc1b7e7ac76df0eb..e82d4e6f54a1206f19aeecdb77adbdc4b00046fc 100644 (file)
--- 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 ba66f860cfc1fa4286f1ddcc1784655d153d55ca..c806d705c2909fc8006fb8a128516510b807a19f 100644 (file)
--- 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 e017f4e4a91b09e15c20e8b20a5fc849895cc396..8445ccf25e64cbb8e2445c98fb68775502872bb5 100644 (file)
--- 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 {