Changeset d15331 in git


Ignore:
Timestamp:
Jun 14, 2017, 2:48:05 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '60097d763e0b541617a3b864b5310c523edaf81d')
Children:
2a229d3cc5758014672e9d579c497d290c60a648
Parents:
07b0ca476e7677c9eeb3b99f3353ab9ddcc8621e
Message:
polymake: first steps toward polymake 3.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/dyn_modules/polymake/polymake_conversion.cc

    r07b0ca4 rd15331  
    121121  try
    122122  {
     123#if POLYMAKE_VERSION >= 301 /* 3.1 */
     124    i=int(pi);
     125#else
    123126    i = pi.to_int();
     127#endif
    124128  }
    125129  catch (const std::exception& ex)
     
    159163  int cols = mi->cols();
    160164  intvec* iv = new intvec(rows,cols,0);
     165#if POLYMAKE_VERSION >= 301 /*3.1*/
     166  pm::array_traits<pm::Integer>::iterator pi = concat_rows(*mi).begin();
     167#else
    161168  const polymake::Integer* pi = concat_rows(*mi).begin();
     169#endif
    162170  for (int r = 1; r <= rows; r++)
    163171    for (int c = 1; c <= cols; c++)
     
    174182  int cols = mi->cols();
    175183  bigintmat* bim= new bigintmat(rows,cols,coeffs_BIGINT);
     184#if POLYMAKE_VERSION >= 301 /*3.1*/
     185  pm::array_traits<pm::Integer>::iterator pi = concat_rows(*mi).begin();
     186#else
    176187  const polymake::Integer* pi = concat_rows(*mi).begin();
     188#endif
    177189  for (int r = 1; r <= rows; r++)
    178190    for (int c = 1; c <= cols; c++)
Note: See TracChangeset for help on using the changeset viewer.