Commit de9c9d78 authored by Dominik Charousset's avatar Dominik Charousset

Work around more GCC 4.8 bugs

parent 1673d0b3
...@@ -53,14 +53,14 @@ class stream_deserializer : public deserializer { ...@@ -53,14 +53,14 @@ class stream_deserializer : public deserializer {
public: public:
template <class... Ts> template <class... Ts>
explicit stream_deserializer(actor_system& sys, Ts&&... xs) explicit stream_deserializer(actor_system& sys, Ts&&... xs)
: deserializer{sys}, : deserializer(sys),
streambuf_{std::forward<Ts>(xs)...} { streambuf_(std::forward<Ts>(xs)...) {
} }
template <class... Ts> template <class... Ts>
explicit stream_deserializer(execution_unit* ctx, Ts&&... xs) explicit stream_deserializer(execution_unit* ctx, Ts&&... xs)
: deserializer{ctx}, : deserializer(ctx),
streambuf_{std::forward<Ts>(xs)...} { streambuf_(std::forward<Ts>(xs)...) {
} }
template < template <
...@@ -73,8 +73,8 @@ public: ...@@ -73,8 +73,8 @@ public:
>::type >::type
> >
explicit stream_deserializer(S&& sb) explicit stream_deserializer(S&& sb)
: deserializer{nullptr}, : deserializer(nullptr),
streambuf_{std::forward<S>(sb)} { streambuf_(std::forward<S>(sb)) {
} }
void begin_object(uint16_t& typenr, std::string& name) override { void begin_object(uint16_t& typenr, std::string& name) override {
......
...@@ -51,13 +51,13 @@ class stream_serializer : public serializer { ...@@ -51,13 +51,13 @@ class stream_serializer : public serializer {
public: public:
template <class... Ts> template <class... Ts>
explicit stream_serializer(actor_system& sys, Ts&&... xs) explicit stream_serializer(actor_system& sys, Ts&&... xs)
: serializer{sys}, : serializer(sys),
streambuf_{std::forward<Ts>(xs)...} { streambuf_{std::forward<Ts>(xs)...} {
} }
template <class... Ts> template <class... Ts>
explicit stream_serializer(execution_unit* ctx, Ts&&... xs) explicit stream_serializer(execution_unit* ctx, Ts&&... xs)
: serializer{ctx}, : serializer(ctx),
streambuf_{std::forward<Ts>(xs)...} { streambuf_{std::forward<Ts>(xs)...} {
} }
...@@ -71,8 +71,8 @@ public: ...@@ -71,8 +71,8 @@ public:
>::type >::type
> >
explicit stream_serializer(S&& sb) explicit stream_serializer(S&& sb)
: serializer{nullptr}, : serializer(nullptr),
streambuf_{std::forward<S>(sb)} { streambuf_(std::forward<S>(sb)) {
} }
void begin_object(uint16_t& typenr, std::string& name) override { void begin_object(uint16_t& typenr, std::string& name) override {
......
...@@ -114,7 +114,7 @@ protected: ...@@ -114,7 +114,7 @@ protected:
}; };
/// A streambuffer abstraction over a contiguous container. It supports /// A streambuffer abstraction over a contiguous container. It supports
/// reading in the same style as arraybuf, but is unbounded for output. /// reading in the same style as `arraybuf`, but is unbounded for output.
template <class Container> template <class Container>
class containerbuf class containerbuf
: public std::basic_streambuf< : public std::basic_streambuf<
...@@ -149,7 +149,7 @@ public: ...@@ -149,7 +149,7 @@ public:
// See note in arraybuf(arraybuf&&). // See note in arraybuf(arraybuf&&).
// TODO: remove after having raised the minimum GCC version to 5. // TODO: remove after having raised the minimum GCC version to 5.
containerbuf(containerbuf&& other) containerbuf(containerbuf&& other)
: container_{other.container_} { : container_(other.container_) {
this->setg(other.eback(), other.gptr(), other.egptr()); this->setg(other.eback(), other.gptr(), other.egptr());
other.setg(nullptr, nullptr, nullptr); other.setg(nullptr, nullptr, nullptr);
} }
......
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