fix conflict

[modules/med.git] / medtool / src / MEDLoader / SauvMedConvertor.cxx

diff --git a/medtool/src/MEDLoader/SauvMedConvertor.cxx b/medtool/src/MEDLoader/SauvMedConvertor.cxx
index dd2ba8961f036eca1796a3ed1aedc2fd11a80c4c..8972744a409c2bef28d39a28750ff147809f2606 100644 (file)
--- a/medtool/src/MEDLoader/SauvMedConvertor.cxx
+++ b/medtool/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;
     }