APPLE portability (thanks Antoine G.)

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.cxx b/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.cxx
index aaeeabf14874036c52752b5cded32ee75f7d8056..081cab63399650e356b988fe25c31439cfd837cf 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.cxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelAsmX86.cxx
@@ -47,7 +47,11 @@ char *INTERP_KERNEL::AsmX86::copyToExecMemZone(const std::vector<char>& ml, unsi
   char *ret=0;
   int lgth=ml.size();
 #ifdef _POSIX_MAPPED_FILES
+# ifdef __APPLE__
+  ret=(char *)mmap(0,lgth,PROT_EXEC | PROT_WRITE,MAP_ANON | MAP_PRIVATE,-1,0);
+# else
   ret=(char *)mmap(0,lgth,PROT_EXEC | PROT_WRITE,MAP_ANONYMOUS | MAP_PRIVATE,-1,0);
+# endif
 #else
 #ifdef WIN32
   HANDLE h=CreateFileMapping(INVALID_HANDLE_VALUE,NULL,PAGE_EXECUTE_READWRITE,0,lgth,NULL);

diff --git a/src/INTERP_KERNEL/InterpolationUtils.hxx b/src/INTERP_KERNEL/InterpolationUtils.hxx
index dd3ffef94fa558c5012b0286b7fe91a0f1da38d1..a96072b7841713f8be3ee53764edd3c49a3d58cf 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationUtils.hxx
+++ b/src/INTERP_KERNEL/InterpolationUtils.hxx
@@ -710,7 +710,7 @@ namespace INTERP_KERNEL
   class AngleLess
   {
   public:
-    bool operator()(std::pair<double,double>theta1, std::pair<double,double> theta2) 
+    bool operator()(std::pair<double,double>theta1, std::pair<double,double> theta2) const
     {
       double norm1 = sqrt(theta1.first*theta1.first +theta1.second*theta1.second);
       double norm2 = sqrt(theta2.first*theta2.first +theta2.second*theta2.second);

diff --git a/src/INTERP_KERNEL/PolygonAlgorithms.hxx b/src/INTERP_KERNEL/PolygonAlgorithms.hxx
index bbb49362aee6f22c9ee1ee11c499b3a7d177b2ac..5d9f9d8185a11cb27cd08bdc5752af5524453a2b 100644 (file)
--- a/src/INTERP_KERNEL/PolygonAlgorithms.hxx
+++ b/src/INTERP_KERNEL/PolygonAlgorithms.hxx
@@ -30,7 +30,7 @@ namespace INTERP_KERNEL
   class VertexLess
   {
   public:
-    bool operator()(const double * P_1, const double * P_2) 
+    bool operator()(const double * P_1, const double * P_2) const
     {
       for(int idim=0; idim<DIM; idim++)
         {        

diff --git a/src/MEDLoader/SauvMedConvertor.cxx b/src/MEDLoader/SauvMedConvertor.cxx
index dd2ba8961f036eca1796a3ed1aedc2fd11a80c4c..8972744a409c2bef28d39a28750ff147809f2606 100644 (file)
--- a/src/MEDLoader/SauvMedConvertor.cxx
+++ b/src/MEDLoader/SauvMedConvertor.cxx
@@ -46,6 +46,7 @@
 #endif
 
 #ifdef HAS_XDR
+#include <rpc/types.h>
 #include <rpc/xdr.h>
 #endif
 
@@ -209,7 +210,7 @@ namespace
    */
   struct TCellByIDCompare
   {
-    bool operator () (const Cell* i1, const Cell* i2)
+    bool operator () (const Cell* i1, const Cell* i2) const
     {
       return i1->_number < i2->_number;
     }