From f3dbb94fd4371921ae186d06d33844a4ebf868f7 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Fri, 3 Oct 2008 14:52:24 +0000
Subject: [PATCH] resolve the conflict (sorry...) add string.h needed for
strdup and strcmp with some gcc version
---
Mesh/Field.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index 9d559dd56d..6529ca6800 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -11,6 +11,7 @@
#include <math.h>
#include <fstream>
#include <string>
+#include <string.h>
#include <sstream>
#ifdef HAVE_MATH_EVAL
@@ -946,12 +947,8 @@ class PostViewField : public Field
OctreePost *octree;
public:
int view_index;
-<<<<<<< Field.cpp
bool crop_negative_values;
- double operator() (double x, double y, double z)
-=======
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
if(view_index < 0 || view_index >= (int)PView::list.size())
--
GitLab