2 files changed, 3 insertions, 3 deletions
diff --git a/src/async/async.cpp b/src/async/async.cpp
index c53ffa6..360e455 100644
--- a/src/async/async.cpp
+++ b/src/async/async.cpp
@@ -291,7 +291,7 @@ bool event_loop::poll() {
 	return turn_loop();
 }
 
-event_port *event_loop::event_port() { return event_port_.get(); }
+event_port *event_loop::get_event_port() { return event_port_.get(); }
 
 conveyor_sink_set &event_loop::daemon() {
 	if (!daemon_sink_) {
diff --git a/src/async/async.h b/src/async/async.h
index 4cfed60..8190be0 100644
--- a/src/async/async.h
+++ b/src/async/async.h
@@ -321,7 +321,7 @@ public:
 
 template <typename T> struct conveyor_and_feeder {
 	own<conveyor_feeder<T>> feeder;
-	conveyor<T> conveyor;
+	class conveyor<T> conveyor;
 };
 
 template <typename T> conveyor_and_feeder<T> new_conveyor_and_feeder();
@@ -437,7 +437,7 @@ public:
 	bool wait(const std::chrono::steady_clock::time_point &);
 	bool poll();
 
-	event_port *event_port();
+	event_port *get_event_port();
 
 	conveyor_sink_set &daemon();
 };