Move to automake 1.8/1.9

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

diff --git a/include/yaz++/z-assoc.h b/include/yaz++/z-assoc.h
index c78906c..1a6e673 100644 (file)
--- a/include/yaz++/z-assoc.h
+++ b/include/yaz++/z-assoc.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2005, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: z-assoc.h,v 1.6 2003-12-16 14:17:01 adam Exp $
+ * $Id: z-assoc.h,v 1.10 2005-06-25 15:53:19 adam Exp $
  */
 
 #ifndef YAZ_Z_ASSOC_INCLUDED
@@ -13,16 +13,17 @@
 #include <yaz/odr.h>
 #include <yaz++/pdu-observer.h>
 
+namespace yazpp_1 {
 /** Z39.50 Assocation.
     This object implements the client - and server role of a generic
     Z39.50 Association.
 */
-class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
+class YAZ_EXPORT Z_Assoc : public IPDU_Observer {
  public:
     /// Create object using the PDU Observer specified
-    Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable);
+    Z_Assoc(IPDU_Observable *the_PDU_Observable);
     /// Destroy assocation and close PDU Observer
-    virtual ~Yaz_Z_Assoc();
+    virtual ~Z_Assoc();
     /// Receive PDU
     void recv_PDU(const char *buf, int len);
     /// Connect notification
@@ -61,20 +62,20 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
     /// OtherInformation
     void get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip);
     Z_OtherInformationUnit *update_otherInformation (
-       Z_OtherInformation **otherInformationP, int createFlag,
-       int *oid, int categoryValue, int deleteFlag);
+        Z_OtherInformation **otherInformationP, int createFlag,
+        int *oid, int categoryValue, int deleteFlag);
     void set_otherInformationString (
-       Z_OtherInformation **otherInformationP,
-       int *oid, int categoryValue,
-       const char *str);
+        Z_OtherInformation **otherInformationP,
+        int *oid, int categoryValue,
+        const char *str);
     void set_otherInformationString (
-       Z_OtherInformation **otherInformation,
-       int oidval, int categoryValue,
-       const char *str);
+        Z_OtherInformation **otherInformation,
+        int oidval, int categoryValue,
+        const char *str);
     void set_otherInformationString (
-       Z_APDU *apdu,
-       int oidval, int categoryValue,
-       const char *str);
+        Z_APDU *apdu,
+        int oidval, int categoryValue,
+        const char *str);
 
     Z_ReferenceId *getRefID(char* str);
     Z_ReferenceId **get_referenceIdP(Z_APDU *apdu);
@@ -87,7 +88,7 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
  private:
     static int yaz_init_flag;
     static int yaz_init_func();
-    IYaz_PDU_Observable *m_PDU_Observable;
+    IPDU_Observable *m_PDU_Observable;
     ODR m_odr_in;
     ODR m_odr_out;
     ODR m_odr_print;
@@ -97,5 +98,14 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
     char *m_hostname;
     int m_APDU_yazlog;
 };
+};
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+