Debug for Mantis23293. Specific implementation for GCC6 + C++11

[tools/medcoupling.git] / src / INTERP_KERNEL / ExprEval / InterpKernelExprParser.hxx

diff --git a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
index 6a03b32cf1fa3020287c426bed26a4aeab2ee144..b103645cc4f775c2aab0dd14a83dd08f186037a7 100644 (file)
--- a/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
+++ b/src/INTERP_KERNEL/ExprEval/InterpKernelExprParser.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -44,7 +44,7 @@ namespace INTERP_KERNEL
     INTERPKERNEL_EXPORT virtual void compileX86(std::vector<std::string>& ass) const = 0;
     INTERPKERNEL_EXPORT virtual void compileX86_64(std::vector<std::string>& ass) const = 0;
     INTERPKERNEL_EXPORT virtual void replaceValues(const std::vector<double>& valuesInExpr) = 0;
-    INTERPKERNEL_EXPORT virtual LeafExpr *deepCpy() const = 0;
+    INTERPKERNEL_EXPORT virtual LeafExpr *deepCopy() const = 0;
     INTERPKERNEL_EXPORT static LeafExpr *buildInstanceFrom(const std::string& expr);
   };
 
@@ -58,7 +58,7 @@ namespace INTERP_KERNEL
     INTERPKERNEL_EXPORT void compileX86_64(std::vector<std::string>& ass) const;
     INTERPKERNEL_EXPORT void fillValue(Value *val) const;
     INTERPKERNEL_EXPORT void replaceValues(const std::vector<double>& valuesInExpr);
-    INTERPKERNEL_EXPORT LeafExprVal *deepCpy() const;
+    INTERPKERNEL_EXPORT LeafExprVal *deepCopy() const;
   private:
     double _value;
   };
@@ -79,7 +79,7 @@ namespace INTERP_KERNEL
     INTERPKERNEL_EXPORT void prepareExprEvaluationVec() const;
     INTERPKERNEL_EXPORT void replaceValues(const std::vector<double>& valuesInExpr);
     INTERPKERNEL_EXPORT static bool isRecognizedKeyVar(const std::string& var, int& pos);
-    INTERPKERNEL_EXPORT LeafExprVar *deepCpy() const;
+    INTERPKERNEL_EXPORT LeafExprVar *deepCopy() const;
   public:
     static const char END_OF_RECOGNIZED_VAR[];
   private:
@@ -125,6 +125,10 @@ namespace INTERP_KERNEL
   class ExprParser
   {
   public:
+#if __cplusplus >= 201103L
+    INTERPKERNEL_EXPORT ExprParser(ExprParser&& other);
+    INTERPKERNEL_EXPORT ExprParser& operator=(ExprParser&& other);
+#endif
     INTERPKERNEL_EXPORT ExprParser(const std::string& expr, ExprParser *father=0);
     INTERPKERNEL_EXPORT ExprParser(const char *expr, int lgth, ExprParser *father=0);
     INTERPKERNEL_EXPORT ~ExprParser();