Branch: Tag:

2004-04-06

2004-04-06 15:37:56 by Martin Nilsson <mani@lysator.liu.se>

--without-new-multisets no longer builds and no one would really be interested in doing that anymore. Removing PIKE_NEW_MULTISETS

Rev: src/acconfig.h:1.140
Rev: src/array.c:1.158
Rev: src/builtin.cmod:1.152
Rev: src/builtin_functions.c:1.537
Rev: src/configure.in:1.827
Rev: src/encode.c:1.211
Rev: src/gc.c:1.251
Rev: src/iterators.cmod:1.54
Rev: src/main.c:1.199
Rev: src/modules/Oracle/oracle.c:1.81
Rev: src/multiset.c:1.84
Rev: src/multiset.h:1.33
Rev: src/operators.c:1.188
Rev: src/svalue.c:1.192

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: array.c,v 1.157 2004/04/06 13:00:40 nilsson Exp $ + || $Id: array.c,v 1.158 2004/04/06 15:37:54 nilsson Exp $   */      #include "global.h"
26:   #include "cyclic.h"   #include "multiset.h"    - RCSID("$Id: array.c,v 1.157 2004/04/06 13:00:40 nilsson Exp $"); + RCSID("$Id: array.c,v 1.158 2004/04/06 15:37:54 nilsson Exp $");      PMOD_EXPORT struct array empty_array=   {
960:       case T_MULTISET:    if (a == b) return 0; - #ifdef PIKE_NEW_MULTISETS +     {    ptrdiff_t a_pos = multiset_first (a->u.multiset);    ptrdiff_t b_pos = multiset_first (b->u.multiset);
980: Inside #if defined(PIKE_NEW_MULTISETS)
   sub_msnode_ref (b->u.multiset);    return res;    } - #else -  if (multiset_is_empty (a->u.multiset)) -  if (multiset_is_empty (b->u.multiset)) -  return 0; -  else -  return -1; -  else -  if (multiset_is_empty (b->u.multiset)) -  return 1; -  return alpha_svalue_cmpfun (ITEM (a->u.multiset->ind), ITEM (b->u.multiset->ind)); - #endif +        case T_OBJECT:    if(a->u.object == b->u.object) return 0;