From 86726b00b052694e65b036c262f5fe9096554175 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 2 Jun 2005 06:40:20 +0000 Subject: [PATCH] Introducing namespace yazpp_1 for all YAZ++ functions. This will allows us to remove the annoying YAZ_.. prefix for classes and convert preprocessor defines to proper enums. --- include/yaz++/cql2rpn.h | 4 +++- include/yaz++/ir-assoc.h | 4 +++- include/yaz++/pdu-assoc.h | 17 ++++++++++------- include/yaz++/pdu-observer.h | 5 ++++- include/yaz++/query.h | 6 +++--- include/yaz++/record-cache.h | 4 +++- include/yaz++/socket-manager.h | 5 ++++- include/yaz++/socket-observer.h | 6 +++++- include/yaz++/z-assoc.h | 4 +++- include/yaz++/z-databases.h | 4 +++- include/yaz++/z-query.h | 4 +++- include/yaz++/z-server.h | 5 ++++- src/yaz-cql2rpn.cpp | 4 +++- src/yaz-ir-assoc.cpp | 4 +++- src/yaz-marc-sample.cpp | 4 +++- src/yaz-my-client.cpp | 4 +++- src/yaz-my-server.cpp | 4 +++- src/yaz-pdu-assoc-thread.cpp | 4 +++- src/yaz-pdu-assoc.cpp | 3 ++- src/yaz-socket-manager.cpp | 4 +++- src/yaz-z-assoc.cpp | 4 +++- src/yaz-z-cache.cpp | 6 ++++-- src/yaz-z-databases.cpp | 4 +++- src/yaz-z-query.cpp | 4 +++- src/yaz-z-server-ill.cpp | 4 +++- src/yaz-z-server-sr.cpp | 4 +++- src/yaz-z-server-update.cpp | 4 +++- src/yaz-z-server.cpp | 4 +++- zlint/zlint.h | 4 +++- 29 files changed, 99 insertions(+), 38 deletions(-) diff --git a/include/yaz++/cql2rpn.h b/include/yaz++/cql2rpn.h index be277a8..19c2305 100644 --- a/include/yaz++/cql2rpn.h +++ b/include/yaz++/cql2rpn.h @@ -2,12 +2,13 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: cql2rpn.h,v 1.1 2004-03-29 22:46:50 adam Exp $ + * $Id: cql2rpn.h,v 1.2 2005-06-02 06:40:20 adam Exp $ */ #include #include +namespace yazpp_1 { class YAZ_EXPORT Yaz_cql2rpn { public: Yaz_cql2rpn(); @@ -18,4 +19,5 @@ class YAZ_EXPORT Yaz_cql2rpn { private: cql_transform_t m_transform; }; +}; diff --git a/include/yaz++/ir-assoc.h b/include/yaz++/ir-assoc.h index a78f4b5..a0e7712 100644 --- a/include/yaz++/ir-assoc.h +++ b/include/yaz++/ir-assoc.h @@ -2,12 +2,13 @@ * Copyright (c) 1998-2000, Index Data. * See the file LICENSE for details. * - * $Id: ir-assoc.h,v 1.3 2003-12-16 14:17:01 adam Exp $ + * $Id: ir-assoc.h,v 1.4 2005-06-02 06:40:21 adam Exp $ */ #include #include +namespace yazpp_1 { /** Information Retrieval Assocation. This object implements the client - and server role of a generic Z39.50 Association. @@ -78,3 +79,4 @@ class YAZ_EXPORT Yaz_IR_Assoc: public Yaz_Z_Assoc { int m_lastReceived; int m_log; }; +}; diff --git a/include/yaz++/pdu-assoc.h b/include/yaz++/pdu-assoc.h index 25a2efd..e9ea4fb 100644 --- a/include/yaz++/pdu-assoc.h +++ b/include/yaz++/pdu-assoc.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: pdu-assoc.h,v 1.5 2003-10-23 11:45:08 adam Exp $ + * $Id: pdu-assoc.h,v 1.6 2005-06-02 06:40:21 adam Exp $ */ #ifndef YAZ_PDU_ASSOC_INCLUDED @@ -12,13 +12,14 @@ #include #include +namespace yazpp_1 { /** Simple Protocol Data Unit Assocation. This object sends - and receives PDU's using the COMSTACK network utility. To use the association in client role, use the method connect. The server role is initiated by using the listen method. */ -class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver { +class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, yazpp_1::IYazSocketObserver { friend class Yaz_PDU_AssocThread; private: enum { @@ -41,7 +42,7 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver Yaz_PDU_Assoc *m_children; Yaz_PDU_Assoc *m_next; COMSTACK m_cs; - IYazSocketObservable *m_socketObservable; + yazpp_1::IYazSocketObservable *m_socketObservable; IYaz_PDU_Observer *m_PDU_Observer; char *m_input_buf; int m_input_len; @@ -51,13 +52,13 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver int *m_destroyed; int m_idleTime; int m_log; - void init(IYazSocketObservable *socketObservable); + void init(yazpp_1::IYazSocketObservable *socketObservable); public: COMSTACK comstack(const char *type_and_host, void **vp); /// Create object using specified socketObservable - Yaz_PDU_Assoc(IYazSocketObservable *socketObservable); + Yaz_PDU_Assoc(yazpp_1::IYazSocketObservable *socketObservable); /// Create Object using existing comstack - Yaz_PDU_Assoc(IYazSocketObservable *socketObservable, + Yaz_PDU_Assoc(yazpp_1::IYazSocketObservable *socketObservable, COMSTACK cs); /// Close socket and destroy object. /// virtual ~Yaz_PDU_Assoc(); @@ -84,10 +85,12 @@ class YAZ_EXPORT Yaz_PDU_Assoc : public IYaz_PDU_Observable, IYazSocketObserver class YAZ_EXPORT Yaz_PDU_AssocThread : public Yaz_PDU_Assoc { public: - Yaz_PDU_AssocThread(IYazSocketObservable *socketObservable); + Yaz_PDU_AssocThread(yazpp_1::IYazSocketObservable *socketObservable); private: void childNotify(COMSTACK cs); }; +}; + #endif diff --git a/include/yaz++/pdu-observer.h b/include/yaz++/pdu-observer.h index 3b5bdf5..e135da4 100644 --- a/include/yaz++/pdu-observer.h +++ b/include/yaz++/pdu-observer.h @@ -2,12 +2,14 @@ * Copyright (c) 1998-2000, Index Data. * See the file LICENSE for details. * - * $Id: pdu-observer.h,v 1.4 2003-10-23 11:45:08 adam Exp $ + * $Id: pdu-observer.h,v 1.5 2005-06-02 06:40:21 adam Exp $ */ #ifndef YAZ_PDU_OBSERVER_H #define YAZ_PDU_OBSERVER_H +namespace yazpp_1 { + class IYaz_PDU_Observer; /** Protocol Data Unit Observable. @@ -54,5 +56,6 @@ class YAZ_EXPORT IYaz_PDU_Observer { virtual IYaz_PDU_Observer *sessionNotify( IYaz_PDU_Observable *the_PDU_Observable, int fd) = 0; }; +}; #endif diff --git a/include/yaz++/query.h b/include/yaz++/query.h index 8d2e42f..722b74d 100644 --- a/include/yaz++/query.h +++ b/include/yaz++/query.h @@ -2,10 +2,10 @@ * Copyright (c) 1998-2000, Index Data. * See the file LICENSE for details. * - * $Id: query.h,v 1.1 2002-10-09 12:50:26 adam Exp $ + * $Id: query.h,v 1.2 2005-06-02 06:40:21 adam Exp $ */ - +namespace yazpp_1 { /** Query Generic Query. */ @@ -14,4 +14,4 @@ class YAZ_EXPORT Yaz_Query { /// Print query in buffer described by str and len virtual void print (char *str, int len) = 0; }; - +}; diff --git a/include/yaz++/record-cache.h b/include/yaz++/record-cache.h index e05a4fd..174da53 100644 --- a/include/yaz++/record-cache.h +++ b/include/yaz++/record-cache.h @@ -2,13 +2,14 @@ * Copyright (c) 2002-2004, Index Data. * See the file LICENSE for details. * - * $Id: record-cache.h,v 1.1 2004-03-29 22:46:50 adam Exp $ + * $Id: record-cache.h,v 1.2 2005-06-02 06:40:21 adam Exp $ */ #include #include +namespace yazpp_1 { class Yaz_RecordCache_Entry; class YAZ_EXPORT Yaz_RecordCache { @@ -34,3 +35,4 @@ class YAZ_EXPORT Yaz_RecordCache { Z_RecordComposition *comp); int m_max_size; }; +}; diff --git a/include/yaz++/socket-manager.h b/include/yaz++/socket-manager.h index f4e8162..d86297c 100644 --- a/include/yaz++/socket-manager.h +++ b/include/yaz++/socket-manager.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: socket-manager.h,v 1.3 2004-01-05 11:31:04 adam Exp $ + * $Id: socket-manager.h,v 1.4 2005-06-02 06:40:21 adam Exp $ */ #ifndef YAZ_SOCKET_MANAGER_INCLUDED @@ -11,6 +11,8 @@ #include #include +namespace yazpp_1 { + /** Simple Socket Manager. Implements a stand-alone simple model that uses select(2) to observe socket events. @@ -60,5 +62,6 @@ class YAZ_EXPORT Yaz_SocketManager : public IYazSocketObservable { virtual ~Yaz_SocketManager(); }; +}; #endif diff --git a/include/yaz++/socket-observer.h b/include/yaz++/socket-observer.h index 85bf841..b4291aa 100644 --- a/include/yaz++/socket-observer.h +++ b/include/yaz++/socket-observer.h @@ -2,7 +2,7 @@ * Copyright (c) 1998-2000, Index Data. * See the file LICENSE for details. * - * $Id: socket-observer.h,v 1.3 2005-05-20 21:28:55 adam Exp $ + * $Id: socket-observer.h,v 1.4 2005-06-02 06:40:21 adam Exp $ */ #ifndef YAZ_SOCKET_OBSERVER_H @@ -14,6 +14,9 @@ #define YAZ_SOCKET_OBSERVE_TIMEOUT 8 #include + +namespace yazpp_1 { + /** Forward reference */ @@ -62,4 +65,5 @@ class YAZ_EXPORT IYazSocketObserver { virtual void socketNotify(int event) = 0; }; +}; #endif diff --git a/include/yaz++/z-assoc.h b/include/yaz++/z-assoc.h index c78906c..f025945 100644 --- 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. * - * $Id: z-assoc.h,v 1.6 2003-12-16 14:17:01 adam Exp $ + * $Id: z-assoc.h,v 1.7 2005-06-02 06:40:21 adam Exp $ */ #ifndef YAZ_Z_ASSOC_INCLUDED @@ -13,6 +13,7 @@ #include #include +namespace yazpp_1 { /** Z39.50 Assocation. This object implements the client - and server role of a generic Z39.50 Association. @@ -97,5 +98,6 @@ class YAZ_EXPORT Yaz_Z_Assoc : public IYaz_PDU_Observer { char *m_hostname; int m_APDU_yazlog; }; +}; #endif diff --git a/include/yaz++/z-databases.h b/include/yaz++/z-databases.h index 9ca035a..9f2ce49 100644 --- a/include/yaz++/z-databases.h +++ b/include/yaz++/z-databases.h @@ -2,11 +2,12 @@ * Copyright (c) 2001, Index Data. * See the file LICENSE for details. * - * $Id: z-databases.h,v 1.1 2002-10-09 12:50:26 adam Exp $ + * $Id: z-databases.h,v 1.2 2005-06-02 06:40:21 adam Exp $ */ #include +namespace yazpp_1 { /** Z39.50 Databases list */ class YAZ_EXPORT Yaz_Z_Databases { @@ -24,3 +25,4 @@ public: int m_num; NMEM nmem; }; +}; diff --git a/include/yaz++/z-query.h b/include/yaz++/z-query.h index 3367769..31fcaa9 100644 --- a/include/yaz++/z-query.h +++ b/include/yaz++/z-query.h @@ -2,12 +2,13 @@ * Copyright (c) 1998-2000, Index Data. * See the file LICENSE for details. * - * $Id: z-query.h,v 1.3 2003-10-03 13:01:42 adam Exp $ + * $Id: z-query.h,v 1.4 2005-06-02 06:40:21 adam Exp $ */ #include #include +namespace yazpp_1 { /** Z39.50 Query RPN, etc. */ @@ -38,3 +39,4 @@ class YAZ_EXPORT Yaz_Z_Query : public Yaz_Query { WRBUF zquery2pquery(Z_Query *q); void pr_term(WRBUF wbuf, char *buf, int len); }; +}; diff --git a/include/yaz++/z-server.h b/include/yaz++/z-server.h index 79b4b68..335da7e 100644 --- a/include/yaz++/z-server.h +++ b/include/yaz++/z-server.h @@ -2,11 +2,13 @@ * Copyright (c) 2000-2001, Index Data. * See the file LICENSE for details. * - * $Id: z-server.h,v 1.5 2005-05-17 20:34:36 adam Exp $ + * $Id: z-server.h,v 1.6 2005-06-02 06:40:21 adam Exp $ */ #include +namespace yazpp_1 { + class Yaz_Z_Server; class YAZ_EXPORT Yaz_Z_ServerUtility { @@ -133,3 +135,4 @@ class YAZ_EXPORT Yaz_USMARC { public: const char *get_record(size_t position); }; +}; diff --git a/src/yaz-cql2rpn.cpp b/src/yaz-cql2rpn.cpp index f8ca22b..cf59791 100644 --- a/src/yaz-cql2rpn.cpp +++ b/src/yaz-cql2rpn.cpp @@ -2,13 +2,15 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-cql2rpn.cpp,v 1.6 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-cql2rpn.cpp,v 1.7 2005-06-02 06:40:21 adam Exp $ */ #include #include #include +using namespace yazpp_1; + Yaz_cql2rpn::Yaz_cql2rpn() { m_transform = 0; diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp index edb8a1b..b38b3fd 100644 --- a/src/yaz-ir-assoc.cpp +++ b/src/yaz-ir-assoc.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-ir-assoc.cpp,v 1.23 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-ir-assoc.cpp,v 1.24 2005-06-02 06:40:21 adam Exp $ */ #include @@ -10,6 +10,8 @@ #include #include +using namespace yazpp_1; + Yaz_IR_Assoc::Yaz_IR_Assoc(IYaz_PDU_Observable *the_PDU_Observable) : Yaz_Z_Assoc(the_PDU_Observable) { diff --git a/src/yaz-marc-sample.cpp b/src/yaz-marc-sample.cpp index 037fdf6..5708a5d 100644 --- a/src/yaz-marc-sample.cpp +++ b/src/yaz-marc-sample.cpp @@ -2,11 +2,13 @@ * Copyright (c) 2000-2001, Index Data. * See the file LICENSE for details. * - * $Id: yaz-marc-sample.cpp,v 1.7 2005-05-17 20:34:36 adam Exp $ + * $Id: yaz-marc-sample.cpp,v 1.8 2005-06-02 06:40:21 adam Exp $ */ #include +using namespace yazpp_1; + static const char *marc_records[] = { "\x30\x30\x33\x36\x36\x6E\x61\x6D\x20\x20\x32\x32\x30\x30\x31\x36" "\x39\x38\x61\x20\x34\x35\x30\x30\x30\x30\x31\x30\x30\x31\x33\x30" diff --git a/src/yaz-my-client.cpp b/src/yaz-my-client.cpp index 3a143bf..0f1cc7f 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.18 2005-01-17 09:55:58 adam Exp $ + * $Id: yaz-my-client.cpp,v 1.19 2005-06-02 06:40:21 adam Exp $ */ #include @@ -23,6 +23,8 @@ extern "C" { #endif } +using namespace yazpp_1; + class YAZ_EXPORT MyClient : public Yaz_IR_Assoc { private: int m_interactive_flag; diff --git a/src/yaz-my-server.cpp b/src/yaz-my-server.cpp index adb63de..b636088 100644 --- a/src/yaz-my-server.cpp +++ b/src/yaz-my-server.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2001, Index Data. * See the file LICENSE for details. * - * $Id: yaz-my-server.cpp,v 1.16 2005-05-17 13:00:56 adam Exp $ + * $Id: yaz-my-server.cpp,v 1.17 2005-06-02 06:40:21 adam Exp $ */ #include @@ -13,6 +13,8 @@ #include #include +using namespace yazpp_1; + class MyILL : public Yaz_Facility_ILL { public: void ill_service (Z_ExtendedServicesRequest *req, diff --git a/src/yaz-pdu-assoc-thread.cpp b/src/yaz-pdu-assoc-thread.cpp index fd4373a..54d2cf0 100644 --- a/src/yaz-pdu-assoc-thread.cpp +++ b/src/yaz-pdu-assoc-thread.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-pdu-assoc-thread.cpp,v 1.9 2005-01-14 10:13:50 adam Exp $ + * $Id: yaz-pdu-assoc-thread.cpp,v 1.10 2005-06-02 06:40:21 adam Exp $ */ #ifdef WIN32 @@ -33,6 +33,8 @@ #include #include +using namespace yazpp_1; + Yaz_PDU_AssocThread::Yaz_PDU_AssocThread( IYazSocketObservable *socketObservable) : Yaz_PDU_Assoc(socketObservable) diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp index ab47de3..9efedd3 100644 --- a/src/yaz-pdu-assoc.cpp +++ b/src/yaz-pdu-assoc.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-pdu-assoc.cpp,v 1.39 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-pdu-assoc.cpp,v 1.40 2005-06-02 06:40:21 adam Exp $ */ #include @@ -12,6 +12,7 @@ #include +using namespace yazpp_1; void Yaz_PDU_Assoc::init(IYazSocketObservable *socketObservable) { diff --git a/src/yaz-socket-manager.cpp b/src/yaz-socket-manager.cpp index 4a75923..42d8745 100644 --- a/src/yaz-socket-manager.cpp +++ b/src/yaz-socket-manager.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2005, Index Data. * See the file LICENSE for details. * - * $Id: yaz-socket-manager.cpp,v 1.31 2005-01-14 10:13:50 adam Exp $ + * $Id: yaz-socket-manager.cpp,v 1.32 2005-06-02 06:40:21 adam Exp $ */ #ifdef WIN32 #include @@ -25,6 +25,8 @@ #include #include +using namespace yazpp_1; + Yaz_SocketManager::YazSocketEntry **Yaz_SocketManager::lookupObserver( IYazSocketObserver *observer) { diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp index cc43a6d..9180475 100644 --- a/src/yaz-z-assoc.cpp +++ b/src/yaz-z-assoc.cpp @@ -2,7 +2,7 @@ * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-assoc.cpp,v 1.35 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-z-assoc.cpp,v 1.36 2005-06-02 06:40:21 adam Exp $ */ #include @@ -12,6 +12,8 @@ #include #include +using namespace yazpp_1; + int Yaz_Z_Assoc::yaz_init_func() { #ifndef WIN32 diff --git a/src/yaz-z-cache.cpp b/src/yaz-z-cache.cpp index dc58b25..011ba99 100644 --- a/src/yaz-z-cache.cpp +++ b/src/yaz-z-cache.cpp @@ -2,14 +2,16 @@ * Copyright (c) 2002-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-cache.cpp,v 1.11 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-z-cache.cpp,v 1.12 2005-06-02 06:40:21 adam Exp $ */ #include #include #include -struct Yaz_RecordCache_Entry { +using namespace yazpp_1; + +struct yazpp_1::Yaz_RecordCache_Entry { int m_offset; Z_NamePlusRecord *m_record; Z_RecordComposition *m_comp; diff --git a/src/yaz-z-databases.cpp b/src/yaz-z-databases.cpp index 52b6a31..66807d9 100644 --- a/src/yaz-z-databases.cpp +++ b/src/yaz-z-databases.cpp @@ -2,13 +2,15 @@ * Copyright (c) 2001, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-databases.cpp,v 1.4 2002-10-09 12:50:26 adam Exp $ + * $Id: yaz-z-databases.cpp,v 1.5 2005-06-02 06:40:21 adam Exp $ */ #include #include +using namespace yazpp_1; + Yaz_Z_Databases::Yaz_Z_Databases() { nmem = nmem_create (); diff --git a/src/yaz-z-query.cpp b/src/yaz-z-query.cpp index 5e8ba84..641934c 100644 --- a/src/yaz-z-query.cpp +++ b/src/yaz-z-query.cpp @@ -2,12 +2,14 @@ * Copyright (c) 1998-2003, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-query.cpp,v 1.15 2003-12-20 22:42:53 adam Exp $ + * $Id: yaz-z-query.cpp,v 1.16 2005-06-02 06:40:21 adam Exp $ */ #include #include +using namespace yazpp_1; + Yaz_Z_Query::Yaz_Z_Query() { odr_encode = odr_createmem (ODR_ENCODE); diff --git a/src/yaz-z-server-ill.cpp b/src/yaz-z-server-ill.cpp index 4a3a0a7..4022006 100644 --- a/src/yaz-z-server-ill.cpp +++ b/src/yaz-z-server-ill.cpp @@ -2,12 +2,14 @@ * Copyright (c) 2000-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-server-ill.cpp,v 1.11 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-z-server-ill.cpp,v 1.12 2005-06-02 06:40:21 adam Exp $ */ #include #include +using namespace yazpp_1; + int Yaz_Facility_ILL::init(Yaz_Z_Server *s, Z_InitRequest *initRequest, Z_InitResponse *initResponse) { diff --git a/src/yaz-z-server-sr.cpp b/src/yaz-z-server-sr.cpp index caa0813..1dce4bd 100644 --- a/src/yaz-z-server-sr.cpp +++ b/src/yaz-z-server-sr.cpp @@ -2,13 +2,15 @@ * Copyright (c) 2000-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-server-sr.cpp,v 1.8 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-z-server-sr.cpp,v 1.9 2005-06-02 06:40:21 adam Exp $ * */ #include #include +using namespace yazpp_1; + Z_Records *Yaz_Facility_Retrieval::pack_records (Yaz_Z_Server *s, const char *resultSetName, int start, int xnum, diff --git a/src/yaz-z-server-update.cpp b/src/yaz-z-server-update.cpp index be554f7..bef9f9d 100644 --- a/src/yaz-z-server-update.cpp +++ b/src/yaz-z-server-update.cpp @@ -2,12 +2,14 @@ * Copyright (c) 2000-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-server-update.cpp,v 1.8 2005-05-17 12:59:50 adam Exp $ + * $Id: yaz-z-server-update.cpp,v 1.9 2005-06-02 06:40:21 adam Exp $ */ #include #include +using namespace yazpp_1; + int Yaz_Facility_Update::init(Yaz_Z_Server *s, Z_InitRequest *initRequest, Z_InitResponse *initResponse) { diff --git a/src/yaz-z-server.cpp b/src/yaz-z-server.cpp index 8e475e2..ecd4095 100644 --- a/src/yaz-z-server.cpp +++ b/src/yaz-z-server.cpp @@ -2,12 +2,14 @@ * Copyright (c) 2000-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-z-server.cpp,v 1.20 2004-12-13 20:50:54 adam Exp $ + * $Id: yaz-z-server.cpp,v 1.21 2005-06-02 06:40:21 adam Exp $ */ #include #include +using namespace yazpp_1; + Yaz_Z_Server::Yaz_Z_Server(IYaz_PDU_Observable *the_PDU_Observable) : Yaz_Z_Assoc(the_PDU_Observable) { diff --git a/zlint/zlint.h b/zlint/zlint.h index 694e0e5..49d7b84 100644 --- a/zlint/zlint.h +++ b/zlint/zlint.h @@ -2,11 +2,13 @@ * Copyright (c) 2004, Index Data. * See the file LICENSE for details. * - * $Id: zlint.h,v 1.1 2004-03-25 23:14:07 adam Exp $ + * $Id: zlint.h,v 1.2 2005-06-02 06:40:21 adam Exp $ */ #include +using namespace yazpp_1; + enum Zlint_code { TEST_FINISHED, TEST_CONTINUE, -- 1.7.10.4