C++ support.

[yaz-moved-to-github.git] / odr / odr_choice.c

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 0d8fc65..a4df25e 100644 (file)
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,23 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.9  1995-08-15 12:00:23  quinn
+ * Revision 1.14  1997-05-14 06:53:57  adam
+ * C++ support.
+ *
+ * Revision 1.13  1997/04/30 08:52:10  quinn
+ * Null
+ *
+ * Revision 1.12  1996/10/08  12:58:17  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * Revision 1.11  1995/09/29  17:12:23  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.9  1995/08/15  12:00:23  quinn
  * Updated External
  *
  * Revision 1.8  1995/06/19  17:01:51  quinn
@@ -66,10 +82,10 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
            }
            else if (o->direction != ODR_DECODE)
            {
-               cl = arm[i].class;
+               cl = arm[i].zclass;
                tg = arm[i].tag;
            }
-           if (tg == arm[i].tag && cl == arm[i].class)
+           if (tg == arm[i].tag && cl == arm[i].zclass)
            {
                if (arm[i].tagmode == ODR_IMPLICIT)
                {
@@ -96,5 +112,11 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 
 void odr_choice_bias(ODR o, int what)
 {
-    o->choice_bias = what;
+    if (o->enable_bias)
+        o->choice_bias = what;
+}
+
+void odr_choice_enable_bias (ODR o, int mode)
+{
+    o->enable_bias = mode;
 }