projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed prefix Yaz_ from several class - and interface names now
[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
..
40bdb68
100644
(file)
--- a/
include/yaz++/z-assoc.h
+++ b/
include/yaz++/z-assoc.h
@@
-2,7
+2,7
@@
* Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
*
* Copyright (c) 1998-2000, 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.8 2005-06-08 13:28:05 adam Exp $
*/
#ifndef YAZ_Z_ASSOC_INCLUDED
*/
#ifndef YAZ_Z_ASSOC_INCLUDED
@@
-13,16
+13,17
@@
#include <yaz/odr.h>
#include <yaz++/pdu-observer.h>
#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.
*/
/** 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
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
/// 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
/// Receive PDU
void recv_PDU(const char *buf, int len);
/// Connect notification
@@
-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();
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;
ODR m_odr_in;
ODR m_odr_out;
ODR m_odr_print;
@@
-97,5
+98,6
@@
class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer {
char *m_hostname;
int m_APDU_yazlog;
};
char *m_hostname;
int m_APDU_yazlog;
};
+};
#endif
#endif