From a162071f9a10413577341bbba601cfff66113b46 Mon Sep 17 00:00:00 2001 From: Petar Koretic Date: Thu, 20 Mar 2014 09:59:42 +0000 Subject: 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 Reviewed-by: Andreas Schneider (cherry picked from commit 00d4fbe75336b66262fdca86430655094adb8322) Conflicts: include/libssh/libsshpp.hpp --- include/libssh/libsshpp.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/libssh/libsshpp.hpp') 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); -- cgit