Commit 53087996 authored by COULAUD Olivier's avatar COULAUD Olivier

Update for gcc 4.8.1

parents 5bac74ab 2c02513e
This diff is collapsed.
......@@ -115,9 +115,9 @@ public:
* @param directNeighborsParticles the particles from direct neighbors (this is an array of list)
* @param size the number of direct neighbors
*/
virtual void P2PRemote(const FTreeCoordinate& inLeafPosition,
ContainerClass* const FRestrict targets, const ContainerClass* const FRestrict sources,
ContainerClass* const directNeighborsParticles[27], const int size) {
virtual void P2PRemote(const FTreeCoordinate& /*inLeafPosition*/,
ContainerClass* const FRestrict /*targets*/, const ContainerClass* const FRestrict /*sources*/,
ContainerClass* const /*directNeighborsParticles*/[27], const int /*size*/) {
FDEBUG( FDebug::Controller.write("Warning, P2P remote is used but not implemented!").write(FDebug::Flush) );
}
......
......@@ -19,7 +19,6 @@
#include "FAbstractParticleContainer.hpp"
#include "../Utils/FMath.hpp"
#include "../Utils/FPoint.hpp"
#include <type_traits>
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -75,7 +74,7 @@ public:
/////////////////////////////////////////////////////
/////////////////////////////////////////////////////
FBasicParticleContainer(const FBasicParticleContainer&) = delete;
FBasicParticleContainer(const FBasicParticleContainer&) = delete;
FBasicParticleContainer& operator=(const FBasicParticleContainer&) = delete;
/////////////////////////////////////////////////////
......
......@@ -56,7 +56,7 @@ public:
/** Write data by mem cpy */
template <class ClassType>
void write(const ClassType& object){
buffer.memocopy(reinterpret_cast<const char*>(&object), sizeof(ClassType));
buffer.memocopy(reinterpret_cast<const char*>(&object), int(sizeof(ClassType)));
}
/** Write back, position + sizeof(object) has to be < size */
......
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// This software is a computer program whose purpose is to compute the FMM.
//
// This software is governed by the CeCILL-C and LGPL licenses and
// abiding by the rules of distribution of free software.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public and CeCILL-C Licenses for more details.
// "http://www.cecill.info".
// "http://www.gnu.org/licenses".
// ===================================================================================
#ifndef FDOC_HPP
#define FDOC_HPP
// This page contains the spcial doxygen pages and mainpage.
/*!
* @mainpage ScalFmm
* This has to be edited in the Uttils/FDoc.hpp
*/
#endif FDOC_HPP
......@@ -14,10 +14,14 @@
// relatives à l'usage du LOGICIEL
// ===================================================================================
// ==== CMAKE =====
// @FUSE_BLAS
// ================
#include <iostream>
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <time.h>
#include "../../Src/Utils/FTic.hpp"
......
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