Commit 46063a91 authored by berenger-bramas's avatar berenger-bramas
Browse files

A git svn problem.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@357 2616d619-271b-44dc-8df4-d4a8f33a7222
parent db549250
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "../Utils/FGlobal.hpp" #include "../Utils/FGlobal.hpp"
// To get memcpy // To get memcpy
#include <string.h> #include <cstring>
/** /**
* @author Berenger Bramas (berenger.bramas@inria.fr) * @author Berenger Bramas (berenger.bramas@inria.fr)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define FEXTENDFMBCELL_HPP #define FEXTENDFMBCELL_HPP
#include <string.h> #include <cstring>
#include "../Utils/FComplexe.hpp" #include "../Utils/FComplexe.hpp"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
// To get memcpy // To get memcpy
#include <cstring> #include <cstring>
#include <iostream>
#include "FGlobal.hpp" #include "FGlobal.hpp"
/** /**
...@@ -266,8 +267,7 @@ public: ...@@ -266,8 +267,7 @@ public:
* @param[in] inPosition the position to write out * @param[in] inPosition the position to write out
* @return the output for multiple << operators * @return the output for multiple << operators
*/ */
friend std::ostream& operator<<(std::ostream& output, const F3DPosition& inPosition) friend std::ostream& operator<<(std::ostream& output, const F3DPosition& inPosition){
{
output << "(" << inPosition.getX() << ", " << inPosition.getY() << ", " << inPosition.getZ() <<")"; output << "(" << inPosition.getX() << ", " << inPosition.getY() << ", " << inPosition.getZ() <<")";
return output; // for multiple << operators. return output; // for multiple << operators.
} }
...@@ -276,7 +276,6 @@ public: ...@@ -276,7 +276,6 @@ public:
#endif //F3DPOSITION_HPP #endif //F3DPOSITION_HPP
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <string.h> #include <cstring>
/** This file proposes some methods /** This file proposes some methods
* to work with user input parameters. * to work with user input parameters.
......
Supports Markdown
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