sliencing a few shadowing warnings.

opm/autodiff/AutoDiffMatrix.hpp

@@ -662,11 +662,11 @@ namespace Opm
         /**
          * Constructor which sets all members
          */
-        AutoDiffMatrix(AudoDiffMatrixType type, int rows, int cols,
+        AutoDiffMatrix(AudoDiffMatrixType type, int rows_arg, int cols_arg,
                 DiagRep diag=DiagRep(), SparseRep sparse=SparseRep())
             : type_(type),
-              rows_(rows),
-              cols_(cols),
+              rows_(rows_arg),
+              cols_(cols_arg),
               diag_(diag),
               sparse_(sparse)
         {

opm/autodiff/NonlinearSolver_impl.hpp

@@ -29,9 +29,9 @@ namespace Opm
 {
     template <class PhysicalModel>
     NonlinearSolver<PhysicalModel>::NonlinearSolver(const SolverParameters& param,
-                                                    std::unique_ptr<PhysicalModel> model)
+                                                    std::unique_ptr<PhysicalModel> model_arg)
         : param_(param),
-          model_(std::move(model)),
+          model_(std::move(model_arg)),
           nonlinearIterations_(0),
           linearIterations_(0),
           nonlinearIterationsLast_(0),