From 107d331342b256bb66cc37583c2dac4550306b8c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 16 Oct 2003 08:28:10 +0000 Subject: [PATCH] Fix C++ compiles on newer GCC --- include/yaz++/proxy.h | 4 ++-- src/yaz-proxy.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/yaz++/proxy.h b/include/yaz++/proxy.h index 047f086..2fbdc46 100644 --- a/include/yaz++/proxy.h +++ b/include/yaz++/proxy.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: proxy.h,v 1.16 2003-10-13 19:16:28 adam Exp $ + * $Id: proxy.h,v 1.17 2003-10-16 08:28:10 adam Exp $ */ #include @@ -225,7 +225,7 @@ class YAZ_EXPORT Yaz_Proxy : public Yaz_Z_Assoc { void set_target_idletime (int t) { m_target_idletime = (t > 1) ? t : 600; }; int get_target_idletime () { return m_target_idletime; } int set_config(const char *name); - int reconfig() { m_reconfig_flag = 1; } + void reconfig() { m_reconfig_flag = 1; } int send_to_client(Z_APDU *apdu); void server(const char *addr); void pre_init(); diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index c726985..853d5ee 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy.cpp,v 1.59 2003-10-14 20:19:43 adam Exp $ + * $Id: yaz-proxy.cpp,v 1.60 2003-10-16 08:28:10 adam Exp $ */ #include @@ -53,7 +53,7 @@ static const char *apdu_name(Z_APDU *apdu) } Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable, - Yaz_Proxy *parent = 0) : + Yaz_Proxy *parent) : Yaz_Z_Assoc(the_PDU_Observable), m_bw_stat(60), m_pdu_stat(60) { m_PDU_Observable = the_PDU_Observable; @@ -1213,7 +1213,6 @@ void Yaz_ProxyClient::connectNotify() const char *h = get_hostname(); yaz_log (LOG_LOG, "%sConnection accepted by %s timeout=%d", s, h, m_target_idletime); - int to; timeout(m_target_idletime); if (!m_server) pre_init_client(); -- 1.7.10.4