Commit f2f7ee39 authored by Marian Triebe's avatar Marian Triebe Committed by Dominik Charousset

Fix compile with GCC 4.9

parent 6f84e70b
...@@ -473,7 +473,7 @@ private: ...@@ -473,7 +473,7 @@ private:
message_id local_actor::new_request_id(message_priority mp) { message_id local_actor::new_request_id(message_priority mp) {
auto result = ++last_request_id_; auto result = ++last_request_id_;
pending_responses_.emplace_front(result.response_id(), behavior{}); pending_responses_.emplace_front(result.response_id(), behavior{}, nullptr);
return mp == message_priority::normal ? result : result.with_high_priority(); return mp == message_priority::normal ? result : result.with_high_priority();
} }
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <sstream> #include <sstream>
#include <iterator>
#include "caf/config.hpp" #include "caf/config.hpp"
#include "caf/node_id.hpp" #include "caf/node_id.hpp"
...@@ -234,8 +235,12 @@ void node_id::from_string(const std::string& str) { ...@@ -234,8 +235,12 @@ void node_id::from_string(const std::string& str) {
if (! std::all_of(sep + 1, eos, ::isdigit)) if (! std::all_of(sep + 1, eos, ::isdigit))
return; return;
// iterate two digits in the input string as one byte in hex format // iterate two digits in the input string as one byte in hex format
struct hex_byte_iter { struct hex_byte_iter : std::iterator<std::input_iterator_tag, uint8_t> {
std::string::const_iterator i; using const_iterator = std::string::const_iterator;
const_iterator i;
hex_byte_iter(std::string::const_iterator x) : i(x) {
// nop
}
uint8_t operator*() const { uint8_t operator*() const {
return (hex_nibble(*i) << 4) | hex_nibble(*(i + 1)); return (hex_nibble(*i) << 4) | hex_nibble(*(i + 1));
} }
......
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