Changeset 0d9242 in git


Ignore:
Timestamp:
Nov 29, 2021, 3:36:42 PM (2 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
3ad58c25ca404741a27daf824ff2e689f434bf2c
Parents:
1c90ae397653250439ad7f58016a650d1f64d3af
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-11-29 15:36:42+01:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-11-29 16:01:36+01:00
Message:
fix: no -std=c++11 for C files (from NTL_CPPFLAGS), weigth0.cc stuff
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/oswrapper/Makefile.am

    r1c90ae r0d9242  
    11ACLOCAL_AMFLAGS=-I ../../m4
    22AM_CPPFLAGS=-I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys \
    3 ${FACTORY_INCLUDES} $(OMALLOC_INCLUDES) $(RESOURCES_INCLUDES) \
    4 ${NTL_CPPFLAGS} $(FLINT_CFLAGS) ${GMP_CPPFLAGS}
     3$(OMALLOC_INCLUDES) $(RESOURCES_INCLUDES) \
     4$(FACTORY_INCLUDES) ${GMP_CPPFLAGS}
    55
    66AM_CXXFLAGS=

  • kernel/oswrapper/feread.h

    r1c90ae r0d9242  
    77 * ABSTRACT: terminal input
    88 */
    9 
    10 #include "kernel/structs.h"
    119
    1210EXTERN_VAR char    prompt_char; /*1 either '>' or '.'*/

  • kernel/structs.h

    r1c90ae r0d9242  
    1212/* for omBin */
    1313#include "omalloc/omalloc.h"
    14 
    15 #ifdef HAVE_RINGS
    16 #include "coeffs/si_gmp.h"
    17 #endif
    1814
    1915/* standard types */

  • libpolys/coeffs/si_gmp.h

    r1c90ae r0d9242  
    66// just assume that factory have been built (cplusplus.h!)
    77// instead of duplicating cf_gmp.h here for now...
     8#ifdef __cplusplus
    89#include "factory/cf_gmp.h"
     10#else
     11#include <gmp.h>
     12#endif
     13
    914
    1015#ifndef mpz_size1

  • libpolys/polys/weight.h

    r1c90ae r0d9242  
    2626extern "C" THREAD_VAR double (*wFunctional)(int *degw, int *lpol, int npol,
    2727       double *rel, double wx, double wNsqr);
    28 extern "C" double wFunctionalBuch(int *degw, int *lpol, int npol,
     28double wFunctionalBuch(int *degw, int *lpol, int npol,
    2929       double *rel, double wx, double wNsqr);
    3030void wCall(poly* s, int sl, int *x, double wNsqr, const ring R);
Note: See TracChangeset for help on using the changeset viewer.