aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2017-01-21 09:51:07 -0800
committerAustin Hellyer <[email protected]>2017-01-21 09:51:07 -0800
commit1cccf47fcf42cc8836752810615d63a3013ab04b (patch)
tree3ea84b17bed701f807d16f7cfcd4b2388ad05249 /src
parentDispatch Ready events (diff)
downloadserenity-1cccf47fcf42cc8836752810615d63a3013ab04b.tar.xz
serenity-1cccf47fcf42cc8836752810615d63a3013ab04b.zip
Fix no-framework compilation
Diffstat (limited to 'src')
-rw-r--r--src/client/mod.rs40
1 files changed, 28 insertions, 12 deletions
diff --git a/src/client/mod.rs b/src/client/mod.rs
index eca4147..65cf14e 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -807,12 +807,20 @@ impl Client {
let shard = Arc::new(Mutex::new(shard));
- dispatch(Event::Ready(ready),
- shard.clone(),
- self.framework.clone(),
- self.data.clone(),
- self.login_type,
- self.event_store.clone());
+ feature_framework! {{
+ dispatch(Event::Ready(ready),
+ shard.clone(),
+ self.framework.clone(),
+ self.data.clone(),
+ self.login_type,
+ self.event_store.clone());
+ } else {
+ dispatch(Event::Ready(ready),
+ shard.clone(),
+ self.data.clone(),
+ self.login_type,
+ self.event_store.clone());
+ }}
let monitor_info = feature_framework! {{
MonitorInfo {
@@ -1266,12 +1274,20 @@ fn monitor_shard(mut info: MonitorInfo) {
boot_successful = true;
- dispatch(Event::Ready(ready),
- info.shard.clone(),
- info.framework.clone(),
- info.data.clone(),
- info.login_type,
- info.event_store.clone());
+ feature_framework! {{
+ dispatch(Event::Ready(ready),
+ info.shard.clone(),
+ info.framework.clone(),
+ info.data.clone(),
+ info.login_type,
+ info.event_store.clone());
+ } else {
+ dispatch(Event::Ready(ready),
+ info.shard.clone(),
+ info.data.clone(),
+ info.login_type,
+ info.event_store.clone());
+ }}
break;
},