minor

[yazpp-moved-to-github.git] / include / yaz-pdu-assoc.h

diff --git a/include/yaz-pdu-assoc.h b/include/yaz-pdu-assoc.h
index 205c7ed..6576bb1 100644 (file)
--- a/include/yaz-pdu-assoc.h
+++ b/include/yaz-pdu-assoc.h
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
- * $Id: yaz-pdu-assoc.h,v 1.7 1999-12-06 13:52:45 adam Exp $
+ * $Id: yaz-pdu-assoc.h,v 1.11 2000-09-12 16:40:33 heikki Exp $
  */
 
+#ifndef YAZ_PDU_ASSOC_INCLUDED
+#define YAZ_PDU_ASSOC_INCLUDED
+
 #include <yaz/comstack.h>
 #include <yaz-socket-observer.h>
 #include <yaz-pdu-observer.h>
@@ -30,7 +32,6 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver
     Yaz_PDU_Assoc *m_parent;
     Yaz_PDU_Assoc *m_children;
     Yaz_PDU_Assoc *m_next;
-    COMSTACK Yaz_PDU_Assoc::comstack();
     COMSTACK m_cs;
     IYazSocketObservable *m_socketObservable;
     IYaz_PDU_Observer *m_PDU_Observer;
@@ -42,10 +43,11 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver
     int m_idleTime;
     int m_log;
  public:
+    COMSTACK comstack();
     /// Create object using specified socketObservable
     Yaz_PDU_Assoc(IYazSocketObservable *socketObservable);
     /// Close socket and destroy object.
-    virtual ~Yaz_PDU_Assoc();
+    /// virtual ~Yaz_PDU_Assoc();
     /// Clone the object
     IYaz_PDU_Observable *clone();
     /// Send PDU
@@ -67,3 +69,5 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver
     /// Child start...
     virtual void childNotify(int fd);
 };
+
+#endif
\ No newline at end of file