diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-06-06 19:51:49 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-06-06 19:51:49 +0300 |
| commit | 6da1c9813908e3d832d4554506172aea1ebe9f9f (patch) | |
| tree | 955307cbfaa01b3c4ab7e0893455e60f76738614 /src | |
| parent | ee2b6abd613a4e5369cc89c7b3f6592db8548523 (diff) | |
WIP: Fixing serial for Boost 1.70.0 and newer
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/Utils/Serial.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/slic3r/Utils/Serial.cpp b/src/slic3r/Utils/Serial.cpp index 601719b50..cd2a01cbf 100644 --- a/src/slic3r/Utils/Serial.cpp +++ b/src/slic3r/Utils/Serial.cpp @@ -384,7 +384,13 @@ void Serial::reset_line_num() bool Serial::read_line(unsigned timeout, std::string &line, error_code &ec) { - auto &io_service = get_io_service(); + auto& io_service = +#if BOOST_VERSION >= 107000 + //FIXME this is most certainly wrong! + (boost::asio::io_context&)this->get_executor().context(); + #else + this->get_io_service(); +#endif asio::deadline_timer timer(io_service); char c = 0; bool fail = false; |