Changeset c60380d in git


Ignore:
Timestamp:
Apr 10, 2013, 10:05:02 AM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
55cb6bd95ed2dc1ee1fe4d8f374124dfd3836e86
Parents:
03e4a6b8f52593ef6a94a0f1176b8e693d9d2306
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 10:05:02+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 10:11:44+02:00
Message:
fix: alignment

from master
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/tgb.cc

    r03e4a6 rc60380d  
    14691469
    14701470#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->array_lengths*sizeof(type))
     1471
     1472#define ENLARGE_ALIGN(pointer, type) {if(pointer)\
     1473         pointer=(type*)omReallocAligned(pointer, c->array_lengths*sizeof(type));\
     1474         else pointer=(type*)omAllocAligned(c->array_lengths*sizeof(type));}
    14711475//  BOOLEAN corr=lenS_correct(c->strat);
    14721476  int sugar;
     
    14841488    assume (c->array_lengths >= c->n);
    14851489    ENLARGE (c->T_deg, int);
    1486     ENLARGE (c->tmp_pair_lm, poly);
    1487     ENLARGE (c->tmp_spn, sorted_pair_node *);
    1488 
    1489     ENLARGE (c->short_Exps, long);
     1490    ENLARGE_ALIGN (c->tmp_pair_lm, poly);
     1491    ENLARGE_ALIGN (c->tmp_spn, sorted_pair_node *);
     1492
     1493    ENLARGE_ALIGN (c->short_Exps, long);
    14901494    ENLARGE (c->lengths, int);
    14911495#ifndef HAVE_BOOST
    14921496#ifndef USE_STDVECBOOL
    14931497
    1494     ENLARGE (c->states, char *);
    1495 #endif
    1496 #endif
    1497     ENLARGE (c->gcd_of_terms, poly);
     1498    ENLARGE_ALIGN (c->states, char *);
     1499#endif
     1500#endif
     1501    ENLARGE_ALIGN (c->gcd_of_terms, poly);
    14981502    //if (c->weighted_lengths!=NULL) {
    1499     ENLARGE (c->weighted_lengths, wlen_type);
     1503    ENLARGE_ALIGN (c->weighted_lengths, wlen_type);
    15001504    //}
    1501     //ENLARGE(c->S->m,poly);
     1505    //ENLARGE_ALIGN(c->S->m,poly);
    15021506  }
    15031507  pEnlargeSet (&c->S->m, c->n - 1, 1);
     
    15501554
    15511555#undef ENLARGE
     1556#undef ENLARGE_ALIGN
    15521557  if(p_GetComp (h, currRing) <= c->syz_comp)
    15531558  {
     
    32873292  h = omalloc (n * sizeof (int));
    32883293  lengths = (int *) h;
    3289   weighted_lengths = (wlen_type *) omalloc (n * sizeof (wlen_type));
    3290   gcd_of_terms = (poly *) omalloc (n * sizeof (poly));
     3294  weighted_lengths = (wlen_type *) omAllocAligned (n * sizeof (wlen_type));
     3295  gcd_of_terms = (poly *) omAlloc (n * sizeof (poly));
    32913296
    32923297  short_Exps = (long *) omalloc (n * sizeof (long));
Note: See TracChangeset for help on using the changeset viewer.