From e37f1b24803ae41bba736eabdc14851018578abc Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Tue, 2 Jan 1996 11:46:49 +0000
Subject: [PATCH] Changed 'operator' to 'roperator' to avoid C++ conflict.
 Moved to pl3

---
 include/proto.h       |    8 ++++++--
 include/prt-exp.h     |    2 +-
 include/yaz-version.h |    8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/proto.h b/include/proto.h
index 2366c90..ee49f35 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.28  1996-01-02 08:57:32  quinn
+ * Revision 1.29  1996-01-02 11:46:49  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ * Moved to pl3
+ *
+ * Revision 1.28  1996/01/02  08:57:32  quinn
  * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
  *
  * Revision 1.27  1995/10/12  10:34:46  quinn
@@ -475,7 +479,7 @@ typedef struct Z_Complex
 {
     struct Z_RPNStructure *s1;
     struct Z_RPNStructure *s2;
-    Z_Operator *operator;
+    Z_Operator *roperator;
 } Z_Complex;
 
 typedef struct Z_RPNStructure
diff --git a/include/prt-exp.h b/include/prt-exp.h
index 9fdd806..711969a 100644
--- a/include/prt-exp.h
+++ b/include/prt-exp.h
@@ -114,7 +114,7 @@ typedef struct Z_NetworkAddress
 
 typedef struct Z_PrivateCapOperator
 {
-    char *operator;
+    char *roperator;
     Z_HumanString *description;             /* OPTIONAL */
 } Z_PrivateCapOperator;
     
diff --git a/include/yaz-version.h b/include/yaz-version.h
index c4e1b79..442bcef 100644
--- a/include/yaz-version.h
+++ b/include/yaz-version.h
@@ -2,7 +2,11 @@
  * Current software version.
  *
  * $Log: yaz-version.h,v $
- * Revision 1.7  1995-12-06 15:50:42  quinn
+ * Revision 1.8  1996-01-02 11:46:50  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ * Moved to pl3
+ *
+ * Revision 1.7  1995/12/06  15:50:42  quinn
  * 1.0pl2
  *
  * Revision 1.6  1995/12/05  11:15:57  quinn
@@ -46,5 +50,5 @@
  */
 
 #ifndef YAZ_VERSION
-#define YAZ_VERSION "1.0 patchLevel 2"
+#define YAZ_VERSION "1.0 patchLevel 3"
 #endif
-- 
1.7.10.4