diff options
| author | Petar Koretic <petar.koretic@sartura.hr> | 2014-03-20 09:59:42 +0000 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-03-27 11:15:19 +0100 |
| commit | a162071f9a10413577341bbba601cfff66113b46 (patch) | |
| tree | 1d49437e1eedc2f43e16ebb435c5eb2392d2a1cd /include | |
| parent | 2091dab2739363becef219e0a7e7adda907346fb (diff) | |
| download | libssh-a162071f9a10413577341bbba601cfff66113b46.tar.gz libssh-a162071f9a10413577341bbba601cfff66113b46.tar.xz libssh-a162071f9a10413577341bbba601cfff66113b46.zip | |
libssh: libhpp: fix multiple definitions for acceptForward function
Defining a non inlined class function in a header will cause multiple
definitions when header is included in more that one file since for each
file function will get defined.
Signed-off-by: Petar Koretic <petar.koretic@sartura.hr>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 00d4fbe75336b66262fdca86430655094adb8322)
Conflicts:
include/libssh/libsshpp.hpp
Diffstat (limited to 'include')
| -rw-r--r-- | include/libssh/libsshpp.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp index 1a5d80a9..0dfbec20 100644 --- a/include/libssh/libsshpp.hpp +++ b/include/libssh/libsshpp.hpp @@ -361,8 +361,8 @@ public: * @see ssh_channel_forward_accept * @see Session::listenForward */ - Channel *acceptForward(int timeout_ms); - /* acceptForward is implemented later in this file */ + inline Channel *acceptForward(int timeout_ms); + /* implemented outside the class due Channel references */ void_throwable cancelForward(const char *address, int port){ int err=ssh_forward_cancel(c_session, address, port); |