Skip to content

Commit 39bbfe1

Browse files
committed
Merge branch 'develop' of github.ch.sauter-bc.com:External/lib-cpp-pre into develop
2 parents e8ee19e + 86fa153 commit 39bbfe1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pre/boost/asio/flush.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace boost { namespace asio {
2525
/// @param serial_port Port to flush.
2626
/// @param what Determines the buffers to flush.
2727
/// @param error Set to indicate what error occurred, if any.
28-
void flush_serial_port(
28+
inline void flush_serial_port(
2929
boost::asio::serial_port& serial_port,
3030
flush_type what,
3131
boost::system::error_code& error)
@@ -46,7 +46,7 @@ namespace boost { namespace asio {
4646
#endif
4747
}
4848

49-
void flush_serial_port(
49+
inline void flush_serial_port(
5050
basic_serial_port<mockup_serial_port_service>&,
5151
flush_type,
5252
boost::system::error_code& error) {

pre/boost/asio/get_bytes_available.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace boost { namespace asio {
88

99
/// @brief Returns the number of bytes available for reading from a serial
1010
/// port without blocking.
11-
std::size_t get_bytes_available(
11+
inline std::size_t get_bytes_available(
1212
boost::asio::serial_port& serial_port,
1313
boost::system::error_code& error)
1414
{
@@ -41,7 +41,7 @@ namespace boost { namespace asio {
4141

4242
}
4343

44-
std::size_t get_bytes_available(
44+
inline std::size_t get_bytes_available(
4545
basic_serial_port<mockup_serial_port_service>& serial_port,
4646
boost::system::error_code& error)
4747
{

0 commit comments

Comments
 (0)