Ticket #11261: polybori-m4ri20100817.patch

File polybori-m4ri20100817.patch, 858 bytes (added by AlexanderDreyer, 8 years ago)

Backporting m4ri header issue patch from upcoming PolyBoRi 0.8

  • PyPolyBoRi/main_wrapper.cc

    # HG changeset patch
    # User Alexander Dreyer <adreyer@gmx.de>
    # Date 1305214291 -7200
    # Node ID fa85c2c02d3dcdb4ce6f53b0cbecaa256d7c5887
    # Parent  ef80fe41226fc1a10b5108bdf8b26fd6207a58d0
    FIX: newer m4ri has non-selfcontaning headers (Sage Trac #11261)
    
    diff --git a/PyPolyBoRi/main_wrapper.cc b/PyPolyBoRi/main_wrapper.cc
    a b  
    2222#ifdef HAVE_M4RI
    2323#define PACKED 1
    2424extern "C"{
    25 #include <m4ri/packedmatrix.h>
    26 #include <m4ri/grayflex.h>
     25#include <m4ri/m4ri.h>
    2726}
    2827
    2928#endif
  • groebner/src/fglm.cc

    diff --git a/groebner/src/fglm.cc b/groebner/src/fglm.cc
    a b  
    1010#include <polybori/groebner/nf.h>
    1111#include <polybori/groebner/interpolate.h>
    1212extern "C" {
    13 #include <m4ri/packedmatrix.h>
     13#include <m4ri/m4ri.h>
    1414}
    1515
    1616using namespace std;