|
9 | 9 |
|
10 | 10 | #include<string> |
11 | 11 | #include<map> |
12 | | -#include<boost/function.hpp> |
| 12 | +#include<functional> |
13 | 13 | #include<network/message/message_base.hpp> |
14 | 14 | #include<boost/shared_container_iterator.hpp> |
15 | 15 |
|
16 | 16 | namespacenetwork { |
17 | 17 |
|
18 | | -structmessage_pimpl; |
| 18 | +structmessage_pimpl; |
19 | 19 |
|
20 | | -// The common message type. |
21 | | -structmessage : message_base { |
22 | | -// Nested types |
23 | | -typedef boost::iterator_range< |
| 20 | +// The common message type. |
| 21 | +structmessage : message_base { |
| 22 | +// Nested types |
| 23 | +typedef boost::iterator_range< |
24 | 24 | std::multimap<std::string, std::string>::const_iterator> |
25 | 25 | headers_range; |
26 | 26 |
|
27 | | -// Constructors |
28 | | -message(); |
29 | | -message(messageconst & other); |
| 27 | +// Constructors |
| 28 | +message(); |
| 29 | +message(messageconst & other); |
| 30 | +message(message && other) =default; |
30 | 31 |
|
31 | | -// Assignment |
32 | | - message &operator=(message other); |
| 32 | +// Assignment |
| 33 | + message&operator=(messageconst &other); |
| 34 | + message&operator=(message &&other); |
33 | 35 |
|
34 | | -// Mutators |
35 | | -virtualvoidset_destination(std::stringconst & destination); |
36 | | -virtualvoidset_source(std::stringconst & source); |
37 | | -virtualvoidappend_header(std::stringconst & name, |
38 | | - std::stringconst & value); |
39 | | -virtualvoidremove_headers(std::stringconst & name); |
40 | | -virtualvoidremove_headers(); |
41 | | -virtualvoidset_body(std::stringconst & body); |
42 | | -virtualvoidappend_body(std::stringconst & data); |
| 36 | +// Mutators |
| 37 | +virtualvoidset_destination(std::stringconst & destination); |
| 38 | +virtualvoidset_source(std::stringconst & source); |
| 39 | +virtualvoidappend_header(std::stringconst & name, |
| 40 | +std::stringconst & value); |
| 41 | +virtualvoidremove_headers(std::stringconst & name); |
| 42 | +virtualvoidremove_headers(); |
| 43 | +virtualvoidset_body(std::stringconst & body); |
| 44 | +virtualvoidappend_body(std::stringconst & data); |
43 | 45 |
|
44 | | -// Retrievers |
45 | | -virtualvoidget_destination(std::string & destination)const; |
46 | | -virtualvoidget_source(std::string & source)const; |
47 | | -virtualvoidget_headers( |
48 | | - boost::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
49 | | -virtualvoidget_headers( |
50 | | - std::stringconst & name, |
51 | | - boost::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
52 | | -virtualvoidget_headers( |
53 | | - boost::function<bool(std::stringconst &, std::stringconst &)> predicate, |
54 | | - boost::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
55 | | -virtualvoidget_body(std::string & body)const; |
56 | | -virtualvoidget_body( |
57 | | - boost::function<void(boost::iterator_range<charconst *>)> chunk_reader, |
58 | | - size_t size)const; |
| 46 | +// Retrievers |
| 47 | +virtualvoidget_destination(std::string & destination)const; |
| 48 | +virtualvoidget_source(std::string & source)const; |
| 49 | +virtualvoidget_headers(std::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
| 50 | +virtualvoidget_headers(std::stringconst & name, |
| 51 | + std::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
| 52 | +virtualvoidget_headers(std::function<bool(std::stringconst &, std::stringconst &)> predicate, |
| 53 | + std::function<void(std::stringconst &, std::stringconst &)> inserter)const; |
| 54 | +virtualvoidget_body(std::string & body)const; |
| 55 | +virtualvoidget_body(std::function<void(std::string::const_iterator,size_t)> chunk_reader, size_t size)const; |
59 | 56 |
|
60 | | -voidswap(message & other); |
| 57 | +voidswap(message & other); |
61 | 58 |
|
62 | | -// Destructor |
63 | | -virtual~message(); |
64 | | -private: |
65 | | - message_pimpl * pimpl; |
66 | | -}; |
| 59 | +// Destructor |
| 60 | +virtual~message(); |
| 61 | +private: |
| 62 | +message_pimpl * pimpl; |
| 63 | +}; |
67 | 64 |
|
68 | | -inlinevoidswap(message & left, message & right) { |
| 65 | +inlinevoidswap(message & left, message & right) { |
69 | 66 | left.swap(right); |
70 | | -} |
| 67 | +} |
71 | 68 |
|
72 | | -template<classDirective> |
73 | | -message_base &operator<< (message_base & msg, Directive directive) { |
74 | | -directive(msg); |
75 | | -return msg; |
76 | | -} |
| 69 | +template<classDirective> |
| 70 | +message_base &operator<< (message_base & msg, Directive directive) { |
| 71 | +directive(msg); |
| 72 | +return msg; |
| 73 | +} |
77 | 74 |
|
78 | 75 | }// namespace network |
79 | 76 |
|
|