Remove forward declarations

Author: tstenner

src/forward.h

@@ -24,9 +24,7 @@ class portable_iarchive;
 
 namespace lsl {
 /// shared pointers to various classes
-using consumer_queue_p = std::shared_ptr<class consumer_queue>;
 using factory_p = std::shared_ptr<class factory>;
-using resolve_attempt_udp_p = std::shared_ptr<class resolve_attempt_udp>;
 using sample_p = lslboost::intrusive_ptr<class sample>;
 using send_buffer_p = std::shared_ptr<class send_buffer>;
 using stream_info_impl_p = std::shared_ptr<class stream_info_impl>;

src/resolver_impl.cpp

@@ -186,12 +186,12 @@ void resolver_impl::next_resolve_wave() {
 
 void resolver_impl::udp_multicast_burst() {
 	// start one per IP stack under consideration
-	for (std::size_t k = 0, failures = 0; k < udp_protocols_.size(); k++) {
+	int failures = 0;
+	for (auto protocol: udp_protocols_) {
 		try {
-			resolve_attempt_udp_p attempt(
-				std::make_shared<resolve_attempt_udp>(*io_, udp_protocols_[k], mcast_endpoints_,
-					query_, results_, results_mut_, cfg_->multicast_max_rtt(), this));
-			attempt->begin();
+			std::make_shared<resolve_attempt_udp>(*io_, protocol, mcast_endpoints_, query_,
+				results_, results_mut_, cfg_->multicast_max_rtt(), this)
+				->begin();
 		} catch (std::exception &e) {
 			if (++failures == udp_protocols_.size())
 				LOG_F(ERROR,
@@ -205,12 +205,13 @@ void resolver_impl::udp_multicast_burst() {
 void resolver_impl::udp_unicast_burst(error_code err) {
 	if (err == error::operation_aborted) return;
 
+	int failures = 0;
 	// start one per IP stack under consideration
-	for (std::size_t k = 0, failures = 0; k < udp_protocols_.size(); k++) {
+	for (auto protocol: udp_protocols_) {
 		try {
-			resolve_attempt_udp_p attempt(new resolve_attempt_udp(*io_, udp_protocols_[k],
-				ucast_endpoints_, query_, results_, results_mut_, cfg_->unicast_max_rtt(), this));
-			attempt->begin();
+			std::make_shared<resolve_attempt_udp>(*io_, protocol, ucast_endpoints_, query_,
+				results_, results_mut_, cfg_->unicast_max_rtt(), this)
+				->begin();
 		} catch (std::exception &e) {
 			if (++failures == udp_protocols_.size())
 				LOG_F(WARNING,

src/send_buffer.cpp

@@ -14,7 +14,7 @@ using namespace lsl;
  *the send_buffer (so this is a global limit).
  * @return Shared pointer to the newly created queue.
  */
-consumer_queue_p send_buffer::new_consumer(int max_buffered) {
+std::shared_ptr<consumer_queue> send_buffer::new_consumer(int max_buffered) {
 	max_buffered = max_buffered ? std::min(max_buffered, max_capacity_) : max_capacity_;
 	return std::make_shared<consumer_queue>(max_buffered, shared_from_this());
 }

src/send_buffer.h

@@ -40,7 +40,7 @@ class send_buffer : public std::enable_shared_from_this<send_buffer> {
 	 * of the send_buffer (so this is a global limit).
 	 * @return Shared pointer to the newly created consumer.
 	 */
-	consumer_queue_p new_consumer(int max_buffered = 0);
+	std::shared_ptr<consumer_queue> new_consumer(int max_buffered = 0);
 
 	/// Push a sample onto the send buffer that will subsequently be received by all consumers.
 	void push_sample(const sample_p &s);

src/tcp_server.cpp

@@ -507,7 +507,7 @@ void client_session::transfer_samples_thread(std::shared_ptr<client_session>) {
 	if (max_buffered_ <= 0) return;
 	try {
 		// make a new consumer queue
-		consumer_queue_p queue = serv_->send_buffer_->new_consumer(max_buffered_);
+		auto queue = serv_->send_buffer_->new_consumer(max_buffered_);
 		// the sequence # is merely used to determine chunk boundaries (no need for int64)
 		uint32_t seqn = 0;
 		while (!serv_->shutdown_) {