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

---
 asn/proto.c    |    7 +++++--
 asn/prt-exp.c  |    7 +++++--
 util/pquery.c  |    7 +++++--
 util/query.c   |   15 +++++++++------
 util/yaz-ccl.c |    2 +-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/asn/proto.c b/asn/proto.c
index d5910ea..b654eac 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.39  1995-09-29 17:11:53  quinn
+ * Revision 1.40  1996-01-02 11:46:40  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.39  1995/09/29  17:11:53  quinn
  * Smallish
  *
  * Revision 1.38  1995/09/27  15:02:40  quinn
@@ -661,7 +664,7 @@ int z_Complex(ODR o, Z_Complex **p, int opt)
     return
     	z_RPNStructure(o, &(*p)->s1, 0) &&
     	z_RPNStructure(o, &(*p)->s2, 0) &&
-    	z_Operator(o, &(*p)->operator, 0) &&
+    	z_Operator(o, &(*p)->roperator, 0) &&
     	odr_sequence_end(o);
 }
 
diff --git a/asn/prt-exp.c b/asn/prt-exp.c
index be6355d..b11a9aa 100644
--- a/asn/prt-exp.c
+++ b/asn/prt-exp.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: prt-exp.c,v $
- * Revision 1.7  1995-12-14 16:28:07  quinn
+ * Revision 1.8  1996-01-02 11:46:41  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.7  1995/12/14  16:28:07  quinn
  * More explain stuff.
  *
  * Revision 1.6  1995/12/14  11:09:09  quinn
@@ -319,7 +322,7 @@ int z_PrivateCapOperator(ODR o, Z_PrivateCapOperator **p, int opt)
     if (!odr_sequence_begin(o, p, sizeof(**p)))
         return opt && odr_ok(o);
     return
-        odr_implicit(o, z_InternationalString, &(*p)->operator, ODR_CONTEXT, 0, 0) &&
+        odr_implicit(o, z_InternationalString, &(*p)->roperator, ODR_CONTEXT, 0, 0) &&
         odr_implicit(o, z_HumanString, &(*p)->description, ODR_CONTEXT, 1, 1) &&
 	odr_sequence_end(o);
 }
diff --git a/util/pquery.c b/util/pquery.c
index 5dd6516..eccf10b 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.7  1995-09-29 17:12:36  quinn
+ * Revision 1.8  1996-01-02 11:46:56  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.7  1995/09/29  17:12:36  quinn
  * Smallish
  *
  * Revision 1.6  1995/09/27  15:03:03  quinn
@@ -184,7 +187,7 @@ static Z_Complex *rpn_complex (ODR o, int num_attr, int max_attr,
 
     zc = odr_malloc (o, sizeof(*zc));
     zo = odr_malloc (o, sizeof(*zo));
-    zc->operator = zo;
+    zc->roperator = zo;
     switch (query_look)
     {
     case 'a':
diff --git a/util/query.c b/util/query.c
index b8bff70..6b3236b 100644
--- a/util/query.c
+++ b/util/query.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: query.c,v $
- * Revision 1.2  1995-05-16 08:51:14  quinn
+ * Revision 1.3  1996-01-02 11:46:56  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.2  1995/05/16  08:51:14  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.1  1995/04/10  10:28:47  quinn
@@ -81,19 +84,19 @@ static Z_Complex *makecomplex(ODR o, char **buf)
     char op[100], *b;
 
     r = odr_malloc(o, sizeof(*r));
-    r->operator = odr_malloc(o, sizeof(*r->operator));
+    r->roperator = odr_malloc(o, sizeof(*r->roperator));
 
     b = op;
     while (**buf && !isspace(**buf))
     	*(b++) = *((*buf)++);
     *b = 0;
     if (!strcmp(op, "and"))
-    	r->operator->which = Z_Operator_and;
+    	r->roperator->which = Z_Operator_and;
     else if (!strcmp(op, "or"))
-    	r->operator->which = Z_Operator_or;
+    	r->roperator->which = Z_Operator_or;
     else if (!strcmp(op, "not"))
-    	r->operator->which = Z_Operator_and_not;
-    r->operator->u.and = "";
+    	r->roperator->which = Z_Operator_and_not;
+    r->roperator->u.and = "";
     while (**buf && !isspace(**buf))
     	(*buf)++;
     if (!(r->s1 = makerpn(o, buf)))
diff --git a/util/yaz-ccl.c b/util/yaz-ccl.c
index 55de4de..f00126d 100644
--- a/util/yaz-ccl.c
+++ b/util/yaz-ccl.c
@@ -92,7 +92,7 @@ static Z_Complex *ccl_rpn_complex (struct ccl_rpn_node *p)
     zo = xmalloc (sizeof(*zo));
     assert (zo);
 
-    zc->operator = zo;
+    zc->roperator = zo;
     switch (p->kind)
     {
     case CCL_RPN_AND:
-- 
1.7.10.4