X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fmaster-header;h=56a7dd52a048a36b6ec8c1860d2d16e73ec80e77;hb=c29b07cd7dc9cd6945bf79477e0ccd10252485bf;hp=4e331f9cec46062c283b8febd193dfff7a8b349c;hpb=f8e0abc7bbc095fd88e19c76ed142fa8f5f10d73;p=yazpp-moved-to-github.git

diff --git a/zoom/master-header b/zoom/master-header
index 4e331f9..56a7dd5 100644
--- a/zoom/master-header
+++ b/zoom/master-header
@@ -1,4 +1,4 @@
-// $Header: /home/cvsroot/yaz++/zoom/master-header,v 1.3 2002-08-09 10:45:30 mike Exp $
+// $Header: /home/cvsroot/yaz++/zoom/master-header,v 1.5 2002-10-30 09:13:31 adam Exp $
 //
 // ZOOM C++ Binding.
 // The ZOOM homepage is at http://zoom.z3950.org/
@@ -32,21 +32,23 @@ namespace ZOOM {
 
   class connection {
 *   ZOOM_connection c;
+*   friend class resultSet; // so it can use _getYazConnection()
+*   ZOOM_connection _getYazConnection () const { return c; }
   public:
     connection (const char *hostname, int portnum);
     ~connection ();
     const char *option (const char *key) const;
     const char *option (const char *key, const char *val);
-*   ZOOM_connection _getYazConnection () const { return c; } // package-private
   };
 
   class query {
       // pure virtual class: derive concrete subclasses from it.
+*   friend class resultSet; // so it can use _getYazQuery()
+*   ZOOM_query _getYazQuery () const { return q; }
 * protected:
 *   ZOOM_query q;
   public:
     virtual ~query ();
-*   ZOOM_query _getYazQuery () const { return q; } // package-private
   };
 
   class prefixQuery : public query {
@@ -76,9 +78,10 @@ namespace ZOOM {
   class record {
 *   const resultSet *owner;
 *   ZOOM_record r;
-  public:
+*   friend class resultSet; // so it can use this constructor
 *   record::record (const resultSet *rs, ZOOM_record rec):
 *	owner (rs), r (rec) {}
+  public:
     ~record ();
     enum syntax {
       UNKNOWN, GRS1, SUTRS, USMARC, UKMARC, XML
@@ -119,8 +122,10 @@ namespace ZOOM {
 *   const char *q;
   public:
 *   ~queryException ();
-    static const int PREFIX = 1;
-    static const int CCL = 2;
+    enum {
+     PREFIX = 1,
+     CCL = 2
+    };
     queryException (int qtype, const char *source);
     int errcode () const;
     const char *errmsg () const;