X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_choice.c;h=f0a8f9a448e15d5657bf3c504c359bc545df21f1;hp=46be20703df3d4e5d58e14af9026681f5e02b828;hb=6a39772ad0cbd1bcb5d0984cd783d4a9e06bdfdb;hpb=85a2e7affad79fd8bd59b403ba7b5f7867d60523

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 46be207..f0a8f9a 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.13  1997-04-30 08:52:10  quinn
+ * Revision 1.15  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * 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
@@ -50,7 +56,7 @@
 
 int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
 {
-    int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
+    int i, cl = -1, tg, cn, *which = (int *)whichp, bias = o->choice_bias;
 
     if (o->error)
     	return 0;
@@ -79,26 +85,26 @@ 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)
 	    	{
 		    odr_implicit_settag(o, cl, tg);
-	    	    return (*arm[i].fun)(o, p, 0);
+	    	    return (*arm[i].fun)(o, (char **)p, 0);
 		}
 		/* explicit */
 		if (!odr_constructed_begin(o, p, cl, tg))
 		    return 0;
-		return (*arm[i].fun)(o, p, 0) &&
+		return (*arm[i].fun)(o, (char **)p, 0) &&
 		    odr_constructed_end(o);
 	    }
 	}
 	else  /* no tagging. Have to poll type */
 	{
-	    if ((*arm[i].fun)(o, p, 1) && *(char**)p)
+	    if ((*arm[i].fun)(o, (char **)p, 1) && *(char**)p)
 	    	return 1;
 	}
     }