Skip to content
Snippets Groups Projects
Commit f3dbb94f authored by Jean-François Remacle's avatar Jean-François Remacle
Browse files

resolve the conflict (sorry...)

add string.h needed for strdup and strcmp with some gcc version
parent 4ac09de6
Branches
Tags
No related merge requests found
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <math.h> #include <math.h>
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <string.h>
#include <sstream> #include <sstream>
#ifdef HAVE_MATH_EVAL #ifdef HAVE_MATH_EVAL
...@@ -946,12 +947,8 @@ class PostViewField : public Field ...@@ -946,12 +947,8 @@ class PostViewField : public Field
OctreePost *octree; OctreePost *octree;
public: public:
int view_index; int view_index;
<<<<<<< Field.cpp
bool crop_negative_values; bool crop_negative_values;
double operator() (double x, double y, double z)
=======
double operator() (double x, double y, double z, GEntity *ge=0) double operator() (double x, double y, double z, GEntity *ge=0)
>>>>>>> 1.56
{ {
// FIXME: should test unique view num instead, but that would be slower // FIXME: should test unique view num instead, but that would be slower
if(view_index < 0 || view_index >= (int)PView::list.size()) if(view_index < 0 || view_index >= (int)PView::list.size())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment