Commit d7d0d818 authored by Dominik Charousset's avatar Dominik Charousset

Fix warnings on GCC

parent 6db510a7
...@@ -36,8 +36,8 @@ public: ...@@ -36,8 +36,8 @@ public:
using chunk = std::vector<T>; using chunk = std::vector<T>;
downstream(local_actor* ptr, const stream_id& sid, downstream(local_actor* ptr, const stream_id& sid,
typename abstract_downstream::policy_ptr policy) typename abstract_downstream::policy_ptr pptr)
: abstract_downstream(ptr, sid, std::move(policy)) { : abstract_downstream(ptr, sid, std::move(pptr)) {
// nop // nop
} }
......
...@@ -436,7 +436,7 @@ public: ...@@ -436,7 +436,7 @@ public:
template <class In, class... Ts, class Init, class Fun, class Cleanup> template <class In, class... Ts, class Init, class Fun, class Cleanup>
annotated_stream<typename stream_stage_trait_t<Fun>::output, Ts...> annotated_stream<typename stream_stage_trait_t<Fun>::output, Ts...>
add_stage(const stream<In>& in, std::tuple<Ts...> xs, Init init, Fun fun, add_stage(const stream<In>& in, std::tuple<Ts...> xs, Init init, Fun fun,
Cleanup cleanup, upstream_policy_ptr upolicy = nullptr, Cleanup cleanup_fun, upstream_policy_ptr upolicy = nullptr,
downstream_policy_ptr dpolicy = nullptr) { downstream_policy_ptr dpolicy = nullptr) {
CAF_ASSERT(current_mailbox_element() != nullptr); CAF_ASSERT(current_mailbox_element() != nullptr);
using output_type = typename stream_stage_trait_t<Fun>::output; using output_type = typename stream_stage_trait_t<Fun>::output;
...@@ -462,7 +462,7 @@ public: ...@@ -462,7 +462,7 @@ public:
dpolicy.reset(new policy::anycast); dpolicy.reset(new policy::anycast);
auto ptr = make_counted<impl>(this, sid, std::move(upolicy), auto ptr = make_counted<impl>(this, sid, std::move(upolicy),
std::move(dpolicy), std::move(fun), std::move(dpolicy), std::move(fun),
std::move(cleanup)); std::move(cleanup_fun));
init(ptr->state()); init(ptr->state());
streams_.emplace(sid, ptr); streams_.emplace(sid, ptr);
// Add downstream with 0 credit. // Add downstream with 0 credit.
...@@ -474,15 +474,15 @@ public: ...@@ -474,15 +474,15 @@ public:
/// Adds a stream stage to this actor. /// Adds a stream stage to this actor.
template <class In, class Init, class Fun, class Cleanup> template <class In, class Init, class Fun, class Cleanup>
stream<typename stream_stage_trait_t<Fun>::output> stream<typename stream_stage_trait_t<Fun>::output>
add_stage(const stream<In>& in, Init init, Fun fun, Cleanup cleanup) { add_stage(const stream<In>& in, Init init, Fun fun, Cleanup cleanup_fun) {
return add_stage(in, std::make_tuple(), std::move(init), return add_stage(in, std::make_tuple(), std::move(init),
std::move(fun), std::move(cleanup)); std::move(fun), std::move(cleanup_fun));
} }
/// Adds a stream sink to this actor. /// Adds a stream sink to this actor.
template <class In, class Init, class Fun, class Finalize> template <class In, class Init, class Fun, class Finalize>
stream_result<typename stream_sink_trait_t<Fun, Finalize>::output> stream_result<typename stream_sink_trait_t<Fun, Finalize>::output>
add_sink(const stream<In>& in, Init init, Fun fun, Finalize finalize, add_sink(const stream<In>& in, Init init, Fun fun, Finalize finalize_fun,
upstream_policy_ptr upolicy = nullptr) { upstream_policy_ptr upolicy = nullptr) {
CAF_ASSERT(current_mailbox_element() != nullptr); CAF_ASSERT(current_mailbox_element() != nullptr);
//using output_type = typename stream_sink_trait_t<Fun, Finalize>::output; //using output_type = typename stream_sink_trait_t<Fun, Finalize>::output;
...@@ -509,7 +509,7 @@ public: ...@@ -509,7 +509,7 @@ public:
auto ptr = make_counted<impl>(this, std::move(upolicy), auto ptr = make_counted<impl>(this, std::move(upolicy),
std::move(mptr->sender), std::move(mptr->sender),
std::move(mptr->stages), mptr->mid, std::move(mptr->stages), mptr->mid,
std::move(fun), std::move(finalize)); std::move(fun), std::move(finalize_fun));
init(ptr->state()); init(ptr->state());
streams_.emplace(in.id(), ptr); streams_.emplace(in.id(), ptr);
return {in.id(), std::move(ptr)}; return {in.id(), std::move(ptr)};
......
...@@ -27,8 +27,8 @@ namespace caf { ...@@ -27,8 +27,8 @@ namespace caf {
template <class T> template <class T>
class upstream : public abstract_upstream { class upstream : public abstract_upstream {
public: public:
upstream(local_actor* self, typename abstract_upstream::policy_ptr ptr) upstream(local_actor* selfptr, typename abstract_upstream::policy_ptr ptr)
: abstract_upstream(self, std::move(ptr)) { : abstract_upstream(selfptr, std::move(ptr)) {
// nop // nop
} }
}; };
......
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
// turn off several flags for overflows / sign conversion // turn off several flags for overflows / sign conversion
#ifdef CAF_CLANG #ifdef CAF_CLANG
//#elif defined(CAF_CLANG)
#pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wsign-conversion"
#pragma clang diagnostic ignored "-Wfloat-equal" #pragma clang diagnostic ignored "-Wfloat-equal"
#pragma clang diagnostic ignored "-Wconstant-conversion" #pragma clang diagnostic ignored "-Wconstant-conversion"
#elif defined(CAF_GCC)
#pragma GCC diagnostic ignored "-Woverflow"
#endif #endif
using namespace caf; using namespace caf;
......
...@@ -194,9 +194,9 @@ doorman_ptr asio_multiplexer::new_doorman(asio_tcp_socket_acceptor&& sock) { ...@@ -194,9 +194,9 @@ doorman_ptr asio_multiplexer::new_doorman(asio_tcp_socket_acceptor&& sock) {
return false; return false;
auto& am = acceptor_.backend(); auto& am = acceptor_.backend();
auto sptr = am.new_scribe(std::move(acceptor_.accepted_socket())); auto sptr = am.new_scribe(std::move(acceptor_.accepted_socket()));
auto hdl = sptr->hdl(); auto shdl = sptr->hdl();
parent()->add_scribe(std::move(sptr)); parent()->add_scribe(std::move(sptr));
return doorman::new_connection(&am, hdl); return doorman::new_connection(&am, shdl);
} }
void stop_reading() override { void stop_reading() override {
CAF_LOG_TRACE(""); CAF_LOG_TRACE("");
......
...@@ -275,9 +275,9 @@ void middleman::start() { ...@@ -275,9 +275,9 @@ void middleman::start() {
class stream_serv : public raw_event_based_actor, class stream_serv : public raw_event_based_actor,
public detail::stream_multiplexer::backend { public detail::stream_multiplexer::backend {
public: public:
stream_serv(actor_config& cfg, actor basp) stream_serv(actor_config& cfg, actor basp_ref)
: raw_event_based_actor(cfg), : raw_event_based_actor(cfg),
detail::stream_multiplexer::backend(std::move(basp)), detail::stream_multiplexer::backend(std::move(basp_ref)),
incoming_(this, *this), incoming_(this, *this),
outgoing_(this, *this) { outgoing_(this, *this) {
// nop // nop
......
...@@ -150,28 +150,6 @@ private: ...@@ -150,28 +150,6 @@ private:
const Tup& xs_; const Tup& xs_;
}; };
template <class T>
struct match_helper {
T& ref;
template <class... Fs>
void operator()(Fs... fs) {
struct impl : Fs... {
using result_type = void;
impl(Fs... xs) : Fs(xs)... {
// nop
}
};
impl visitor{std::move(fs)...};
apply_visitor(ref, visitor);
}
};
template <class T>
match_helper<T> match(T& x) {
return {x};
}
template <class Derived> template <class Derived>
class expect_clause_base { class expect_clause_base {
public: public:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment