[Trilinos-Users] [12.2.1] pike patches for Clang

[Denis Davydov]

Dear developers,

Please apply the patches below to fix compiler errors on Clang.

Kind regards,
Denis 

diff --git a/packages/pike/blackbox/test/core/rxn.cpp b/packages/pike/blackbox/test/core/rxn.cpp
index ac37aa3..17bd540 100644
--- a/packages/pike/blackbox/test/core/rxn.cpp
+++ b/packages/pike/blackbox/test/core/rxn.cpp
@@ -36,13 +36,13 @@ namespace pike_test {
      This will demonstrate order of accuracy for split system.
   */
 
-  double evaluateOrder(const std::vector<std::pair<double,double>>& error);
+  double evaluateOrder(const std::vector<std::pair<double,double> >& error);
 
   void runTransientSolve(const double& startTime,
 			 const double& endTime,
 			 const double& stepSize,
 			 RxnAll& rxnME,
-			 std::vector<std::pair<double,double>>& error);
+			 std::vector<std::pair<double,double> >& error);
 
   void runTransientSolveSingleME(const double& startTime,
 				 const double& endTime,
@@ -51,7 +51,7 @@ namespace pike_test {
 				 pike_test::RxnSingleEq1& rxnME1,
 				 pike_test::RxnSingleEq2& rxnME2,
 				 pike_test::RxnSingleEq3& rxnME3,
-				 std::vector<std::pair<double,double>>& error);
+				 std::vector<std::pair<double,double> >& error);
 
   TEUCHOS_UNIT_TEST(rxn, monolithic)
   {
@@ -69,7 +69,7 @@ namespace pike_test {
     const double startTime = 0.0;
     const double endTime = 0.1;
 
-    std::vector<std::pair<double,double>> error;
+    std::vector<std::pair<double,double> > error;
     runTransientSolve(startTime,endTime,1e-1,*rxnME,error);
     runTransientSolve(startTime,endTime,5e-2,*rxnME,error);
     runTransientSolve(startTime,endTime,1e-2,*rxnME,error);
@@ -133,7 +133,7 @@ namespace pike_test {
     const double startTime = 0.0;
     const double endTime = 0.1;
 
-    std::vector<std::pair<double,double>> error;
+    std::vector<std::pair<double,double> > error;
     runTransientSolveSingleME(startTime,endTime,1e-1,*rxnME,*rxnME1,*rxnME2,*rxnME3,error);
     runTransientSolveSingleME(startTime,endTime,5e-2,*rxnME,*rxnME1,*rxnME2,*rxnME3,error);
     runTransientSolveSingleME(startTime,endTime,1e-2,*rxnME,*rxnME1,*rxnME2,*rxnME3,error);
@@ -150,7 +150,7 @@ namespace pike_test {
     TEST_ASSERT( std::abs(order-4.0) < 1.0e-1);
   }
 
-  double evaluateOrder(const std::vector<std::pair<double,double>>& error)
+  double evaluateOrder(const std::vector<std::pair<double,double> >& error)
   {
     const std::size_t size = error.size();
     std::vector<double> log_x(size);
@@ -199,7 +199,7 @@ namespace pike_test {
 			 const double& endTime,
 			 const double& stepSize,
 			 RxnAll& rxnME,
-			 std::vector<std::pair<double,double>>& error)
+			 std::vector<std::pair<double,double> >& error)
   {
     int numSteps = (endTime - startTime) / stepSize;
     TEUCHOS_ASSERT(std::fabs(numSteps*stepSize - (endTime-startTime) ) < 1.0e-10);
@@ -219,7 +219,7 @@ namespace pike_test {
 				 pike_test::RxnSingleEq1& rxnME1,
 				 pike_test::RxnSingleEq2& rxnME2,
 				 pike_test::RxnSingleEq3& rxnME3,
-				 std::vector<std::pair<double,double>>& error)
+				 std::vector<std::pair<double,double> >& error)
   {
     int numSteps = (endTime - startTime) / stepSize;
     TEUCHOS_ASSERT(std::fabs(numSteps*stepSize - (endTime-startTime) ) < 1.0e-10);

diff --git a/packages/pike/blackbox/src/Pike_BlackBoxModelEvaluator_SolverAdapter.cpp b/packages/pike/blackbox/src/Pike_BlackBoxModelEvaluator_SolverAdapter.cpp
index 799ff9b..081182f 100644
--- a/packages/pike/blackbox/src/Pike_BlackBoxModelEvaluator_SolverAdapter.cpp
+++ b/packages/pike/blackbox/src/Pike_BlackBoxModelEvaluator_SolverAdapter.cpp
@@ -35,7 +35,7 @@ namespace pike {
 	  // a new parameter
 	  parameterNameToIndex_[models[m]->getParameterName(p)] = parameterNames_.size();
 	  parameterNames_.push_back(models[m]->getParameterName(p));
-	  std::vector<std::pair<int,int>> tmp;
+	  std::vector<std::pair<int,int> > tmp;
 	  tmp.push_back(std::make_pair(m,p));
 	  parameterIndexToModelIndices_.push_back(tmp);
 	}
@@ -120,7 +120,7 @@ namespace pike {
     TEUCHOS_ASSERT(l >= 0);
     TEUCHOS_ASSERT(l < static_cast<int>(parameterNames_.size()));
     
-    const std::vector<std::pair<int,int>>& meToSet = parameterIndexToModelIndices_[l];
+    const std::vector<std::pair<int,int> >& meToSet = parameterIndexToModelIndices_[l];
 
     // Not ideal.  const_cast or friend class with nonconst private
     // accessor or put public nonconst accessor on solver base.  None