X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_util.c;h=72b80d6c27ee8073c62a199ae1f5e453b93323a8;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=0cee5397764a537ffe8555032c2f959245d7977b;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git diff --git a/odr/odr_util.c b/odr/odr_util.c index 0cee539..72b80d6 100644 --- a/odr/odr_util.c +++ b/odr/odr_util.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: odr_util.c,v $ - * Revision 1.12 1997-10-31 12:20:08 adam + * Revision 1.13 1998-02-11 11:53:34 adam + * Changed code so that it compiles as C++. + * + * Revision 1.12 1997/10/31 12:20:08 adam * Improved memory debugging for xmalloc/nmem.c. References to NMEM * instead of ODR in n ESPEC-1 handling in source d1_espec.c. * Bug fix: missing fclose in data1_read_espec1. @@ -54,7 +57,7 @@ Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o) if (!o) return 0; - if (!(r = nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int)))) + if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int)))) return 0; oid_oidcpy(r, o); return r; @@ -75,7 +78,7 @@ Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str) return 0; while ((p = strchr(p, '.'))) num++, p++; - ret = nmem_malloc(nmem, sizeof(*ret)*(num + 1)); + ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1)); p = str; do ret[i++] = atoi(p);