Changeset ef7b98 in git


Ignore:
Timestamp:
Apr 13, 2011, 6:23:17 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
4dd2c43dea4d3232c22f01e1b49b124b8af13b99
Parents:
ef358a8866629f9a88ba03f846fc2ca516b64b8f
Message:
FIX: fixes due to Sun Studio (removed ncSACache stubs from ncSAMult)

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@14155 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    ref358a ref7b98  
    201201#ifdef HAVE_PLURAL
    202202
    203 #include <kernel/ncSACache.h> // for CCacheHash etc classes
    204203#include <kernel/ncSAMult.h> // for CMultiplier etc classes
    205204
    … …  
    208207template class CMultiplier<CPower>;
    209208
    210 template class CCacheHash<poly>;
    211 template class CCacheHash<int>;
     209// #include <kernel/ncSACache.h> // for CCacheHash etc classes
     210// template class CCacheHash<poly>;
     211// template class CCacheHash<int>;
    212212
    213213#endif

  • kernel/Makefile.in

    ref358a ref7b98  
    9494    febase.cc feread.cc feResource.cc \
    9595    ffields.cc hdegree.cc hilb.cc hutil.cc \
    96     sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSACache.cc ncSAFormula.cc \
     96    sca.cc gring.cc gr_kstd2.cc summator.cc ncSAMult.cc ncSAFormula.cc \
    9797    ideals.cc intvec.cc int64vec.cc \
    9898    khstd.cc kstdfac.cc \

  • kernel/ncSACache.cc

    ref358a ref7b98  
    2727#endif
    2828
     29namespace
     30{
     31  static char* m_Typenames[2] = {"lookup", "store"};
     32}
    2933
     34#include <kernel/ring.h>
     35#include <kernel/p_polys.h>
    3036
    31 #include <ncSACache.h> // for CCacheHash etc classes
     37#include <kernel/ncSACache.h> // for CCacheHash etc classes
    3238
    33 #include <ring.h>
    34 #include <p_polys.h>
    35 
    36 static const char* m_Typenames[2] = {"lookup", "store"};
    3739
    3840void CGlobalCacheHash::History(const EHistoryType t, const CGlobalCacheHash::CExponent a, const CGlobalCacheHash::CExponent b, const poly p)

  • kernel/ncSAMult.cc

    ref358a ref7b98  
    230230}
    231231
    232 static void ggnc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs = NULL)
     232static void ggnc_p_ProcsSet(ring rGR, p_Procs_s* p_Procs)
    233233{
    234234#if OUTPUT 
    … …  
    273273  r->GetNC()->GetGlobalMultiplier() = new CGlobalMultiplier(r);
    274274
    275   ggnc_p_ProcsSet(r);
     275  ggnc_p_ProcsSet(r, NULL);
    276276  return true;
    277277}
    … …  
    286286#endif
    287287
    288   m_cache = new CGlobalCacheHash(r);
     288//  m_cache = new CGlobalCacheHash(r);
    289289  m_powers = new CPowerMultiplier(r);
    290290}
    … …  
    298298#endif
    299299
    300   delete m_cache;
     300//  delete m_cache;
    301301  delete m_powers;
    302302
    … …  
    320320#endif
    321321
    322   CCacheHash<poly>::CCacheItem* pLookup;
    323  
    324   int b = m_cache->LookupEE(expLeft, expRight, pLookup);
    325   // TODO!!!
    326 
    327   // up to now:
    328   assume( b == -1 );
     322//  CCacheHash<poly>::CCacheItem* pLookup;
     323// 
     324//  int b = m_cache->LookupEE(expLeft, expRight, pLookup);
     325//  // TODO!!!
     326//
     327//  // up to now:
     328//  assume( b == -1 );
    329329
    330330  // TODO: use PowerMultiplier!!!!
    … …  
    469469  }
    470470
    471   // TODO!     
    472  
    473 
    474   m_cache->StoreEE( expLeft, expRight, product);
    475   // up to now:
     471//  // TODO!     
     472//
     473//  m_cache->StoreEE( expLeft, expRight, product);
     474//  // up to now:
    476475  return product;
    477476}

  • kernel/ncSAMult.h

    ref358a ref7b98  
    1616#include <kernel/p_Mult_q.h>
    1717
    18 #include <kernel/ncSACache.h> // for CCacheHash etc classes
     18// #include <kernel/ncSACache.h> // for CCacheHash etc classes
    1919#include <kernel/ncSAFormula.h> // for CFormulaPowerMultiplier and enum Enum_ncSAType
    2020
    … …  
    267267{
    268268  private:
    269     CGlobalCacheHash* m_cache;
     269//    CGlobalCacheHash* m_cache;
    270270    CPowerMultiplier* m_powers;
    271271    const CFormulaPowerMultiplier* m_RingFormulaMultiplier;
Note: See TracChangeset for help on using the changeset viewer.