[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] libssh: libhpp: fix multiple definitions for acceptForward function
[Thread Prev] | [Thread Next]
- Subject: [PATCH 1/3] libssh: libhpp: fix multiple definitions for acceptForward function
- From: Petar Koretic <petar.koretic@xxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Thu, 20 Mar 2014 09:59:42 +0000
- To: libssh@xxxxxxxxxx
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@xxxxxxxxxx>
---
include/libssh/libsshpp.hpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp
index 71d6ff5..b516951 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_channel_cancel_forward(c_session, address, port);
@@ -581,8 +581,7 @@ private:
};
-/* This code cannot be put inline due to references to Channel */
-Channel *Session::acceptForward(int timeout_ms){
+inline Channel *Session::acceptForward(int timeout_ms){
ssh_channel forward =
ssh_channel_accept_forward(c_session, timeout_ms, NULL);
ssh_throw_null(c_session,forward);
--
1.9.0
Archive administrator: postmaster@lists.cynapses.org