Merge branch 'V7_dev'

[modules/med.git] / src / MEDCalculator / MEDCalculatorDBField.hxx

diff --git a/src/MEDCalculator/MEDCalculatorDBField.hxx b/src/MEDCalculator/MEDCalculatorDBField.hxx
index 8612191560c1ef6f68c94f1e9a0d16f4c526b8c7..d366215434b0c2b18903c2c0671d0c1197f02150 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBField.hxx
+++ b/src/MEDCalculator/MEDCalculatorDBField.hxx
@@ -26,14 +26,14 @@
 #include "MEDCalculatorDBRangeSelection.hxx"
 
 #include "MEDCouplingRefCountObject.hxx"
-#include "MEDCouplingAutoRefCountObjectPtr.hxx"
+#include "MCAuto.hxx"
 
 #include "InterpKernelException.hxx"
 
 #include <string>
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCalculatorBrowserField;
   class MEDCalculatorDBFieldReal;
@@ -94,7 +94,7 @@ namespace ParaMEDMEM
     bool isEqual(const MEDCalculatorDBField& other, double precM, double precF) const;
     bool isEqualSameType(const MEDCalculatorDBFieldReal& other, double precM, double precF) const;
     MEDCalculatorDBFieldReal *buildCstFieldFromThis(double val) const;
-    void checkCoherency(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception);
+    void checkConsistencyLight(const MEDCalculatorDBFieldReal& other) const throw(INTERP_KERNEL::Exception);
     void fetchData() const throw(INTERP_KERNEL::Exception);
     TypeOfField getType() const { return _type; }
     int getNumberOfSteps() const;
@@ -117,7 +117,7 @@ namespace ParaMEDMEM
     MEDCalculatorDBRangeSelection _p;
     std::vector<std::string> _c_labels;
     MEDCalculatorDBRangeSelection _c;
-    std::vector< MEDCouplingAutoRefCountObjectPtr<MEDCalculatorDBSliceField> > _time_steps;
+    std::vector< MCAuto<MEDCalculatorDBSliceField> > _time_steps;
   };
 
   class MEDCALCULATOR_EXPORT MEDCalculatorDBFieldCst : public MEDCalculatorDBField