RAPPEL : Opération de maintenance > ForgeMIA indisponible le 20 Janvier entre 7h et 12h

Commit c54c02c8 authored by Martin Maechler's avatar Martin Maechler
Browse files

Move system headers first smartly => no NO_REMAP needed anymore

parent d459d004
......@@ -3,15 +3,14 @@
// gmp.h calls cstddef with __need_size_t defined
#include <cstddef>
// and avoid the inclusion of stdlib.h
#include <cstdlib>
#include <cmath>
#include <gmp.h>
#include <R.h>
#define R_NO_REMAP // avoid collisions with stl definitions such as length()
#include <Rinternals.h>
#ifndef AS_INTEGER
// the only thing we use from <Rdefines.h> :
......
......@@ -11,11 +11,11 @@
* \note Licence: GPL (>= 2)
*/
#include "biginteger.h"
#include <stdio.h>
#include <cstdio>
#include <iostream>
#include "biginteger.h"
using std::string;
biginteger::biginteger(const char* raw)
......
......@@ -12,11 +12,11 @@
* \note Licence: GPL (>= 2)
*/
#include <cstdio>
#include "bigrational.h"
#include "bigrationalR.h"
#include <stdio.h>
using std::string;
......
......@@ -15,7 +15,6 @@
#include <string>
#include "Rgmp.h"
#include "biginteger.h"
/**
......
......@@ -14,9 +14,10 @@
#ifndef BIGVEC_HEADER_
#define BIGVEC_HEADER_ 1
#include <memory>
#include "bigmod.h"
#include "templateMatrix.h"
#include <memory>
/** \brief class bigvec
*
......
......@@ -19,12 +19,11 @@
#ifndef EXTRACT_MATRIX_HEADER_GMP_R_
#define EXTRACT_MATRIX_HEADER_GMP_R_ 1
#include <R.h>
#include <Rinternals.h>
#include <functional>
#include <algorithm>
#include "bigvec_q.h"
#include "bigintegerR.h"
#include <algorithm>
extern "C"
{
......
......@@ -20,9 +20,6 @@
using namespace std;
#include "Rgmp.h"
#include "biginteger.h"
#include "bigintegerR.h"
#include "matrix.h"
// need to call matrix_mul_q()
......
......@@ -25,7 +25,6 @@ using namespace std;
#include "bigrational.h"
#include "bigrationalR.h"
//#include "bigintegerR.h"
#include "matrixq.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment