From 9245208f93f95246e44cb597317f9e13c8b60e67 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 28 Mar 2006 19:51:38 +0000
Subject: [PATCH] Remove class qualifiers in method definitions. Breaks gcc
 4.1.

---
 include/yaz++/pdu-assoc.h      |    6 +++---
 include/yaz++/socket-manager.h |    6 +++---
 include/yaz++/z-query.h        |    4 ++--
 include/yaz++/z-server.h       |    4 ++--
 src/yaz-my-client.cpp          |    4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/yaz++/pdu-assoc.h b/include/yaz++/pdu-assoc.h
index 081e120..b981174 100644
--- a/include/yaz++/pdu-assoc.h
+++ b/include/yaz++/pdu-assoc.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: pdu-assoc.h,v 1.8 2005-06-25 15:53:19 adam Exp $
+ * $Id: pdu-assoc.h,v 1.9 2006-03-28 19:51:38 adam Exp $
  */
 
 #ifndef YAZ_PDU_ASSOC_INCLUDED
@@ -33,7 +33,7 @@ class YAZ_EXPORT PDU_Assoc : public IPDU_Observable, yazpp_1::ISocketObserver {
     class PDU_Queue {
     public:
         PDU_Queue(const char *buf, int len);
-        PDU_Queue::~PDU_Queue();
+        ~PDU_Queue();
         char *m_buf;
         int m_len;
         PDU_Queue *m_next;
@@ -48,7 +48,7 @@ class YAZ_EXPORT PDU_Assoc : public IPDU_Observable, yazpp_1::ISocketObserver {
     int m_input_len;
     PDU_Queue *m_queue_out;
     PDU_Queue *m_queue_in;
-    int PDU_Assoc::flush_PDU();
+    int flush_PDU();
     int *m_destroyed;
     int m_idleTime;
     int m_log;
diff --git a/include/yaz++/socket-manager.h b/include/yaz++/socket-manager.h
index fa471f1..d239465 100644
--- a/include/yaz++/socket-manager.h
+++ b/include/yaz++/socket-manager.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: socket-manager.h,v 1.6 2005-06-25 15:53:19 adam Exp $
+ * $Id: socket-manager.h,v 1.7 2006-03-28 19:51:38 adam Exp $
  */
 
 #ifndef YAZ_SOCKET_MANAGER_INCLUDED
@@ -38,9 +38,9 @@ class YAZ_EXPORT SocketManager : public ISocketObservable {
     SocketEvent *m_queue_front;
     SocketEvent *m_queue_back;
     
-    SocketEntry **SocketManager::lookupObserver
+    SocketEntry **lookupObserver
         (ISocketObserver *observer);
-    SocketEvent *SocketManager::getEvent();
+    SocketEvent *getEvent();
     void putEvent(SocketEvent *event);
     void removeEvent(ISocketObserver *observer);
     int m_log;
diff --git a/include/yaz++/z-query.h b/include/yaz++/z-query.h
index 885fde3..6e762b1 100644
--- a/include/yaz++/z-query.h
+++ b/include/yaz++/z-query.h
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-query.h,v 1.7 2005-10-05 12:06:45 adam Exp $
+ * $Id: z-query.h,v 1.8 2006-03-28 19:51:38 adam Exp $
  */
 
 #ifndef YAZPP_Z_QUERY_INCLUDED
@@ -34,7 +34,7 @@ class YAZ_EXPORT Yaz_Z_Query : public Yaz_Query {
     /// Copy
     Yaz_Z_Query &operator=(const Yaz_Z_Query &);
     /// Assign RPN string to it
-    Yaz_Z_Query& Yaz_Z_Query::operator=(const char *rpn);
+    Yaz_Z_Query& operator=(const char *rpn);
  private:
     char *m_buf;
     int m_len;
diff --git a/include/yaz++/z-server.h b/include/yaz++/z-server.h
index cd42c38..738701c 100644
--- a/include/yaz++/z-server.h
+++ b/include/yaz++/z-server.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-server.h,v 1.9 2005-09-22 12:40:45 adam Exp $
+ * $Id: z-server.h,v 1.10 2006-03-28 19:51:38 adam Exp $
  */
 
 #include <yaz++/z-assoc.h>
@@ -23,7 +23,7 @@ class YAZ_EXPORT Z_ServerUtility {
     Z_Records *create_nonSurrogateDiagnostics (ODR odr, int error,
                                                const char *addinfo);
 
-    void Z_ServerUtility::create_diagnostics (
+    void create_diagnostics (
         ODR odr, int error, const char *addinfo,
         Z_DiagRec ***dreca, int *num);
 
diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp
index c310895..7884415 100644
--- a/src/yaz-my-client.cpp
+++ b/src/yaz-my-client.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-my-client.cpp,v 1.21 2005-06-25 15:53:19 adam Exp $
+ * $Id: yaz-my-client.cpp,v 1.22 2006-03-28 19:51:38 adam Exp $
  */
 
 #include <stdlib.h>
@@ -57,7 +57,7 @@ public:
     void timeoutNotify();
     char *get_cookie (Z_OtherInformation **oi);
     int processCommand(const char *cmd);
-    const char *MyClient::getCommand();
+    const char *getCommand();
     int cmd_open(char *host);
     int cmd_connect(char *host);
     int cmd_quit(char *args);
-- 
1.7.10.4