Merge branch '618-replace-uint-with-unsigned-int' into 'master'

Resolve "replace uint with unsigned int"

Closes #618

See merge request !454

ippl/test/FFT/TestFFT.cpp

@@ -352,7 +352,7 @@ int main(int argc, char *argv[])
   ccfft.setDirectionName(-1, "inverse");
 
   testmsg << nLoop << " x In-place CC transform using all-parallel layout ..." << endl;
-  for (uint i=0; i<nLoop; i++) {
+  for (unsigned int i=0; i<nLoop; i++) {
     IpplTimings::startTimer(fftccppTimer);
     ccfft.transform("forward", CFieldPPStan);
     IpplTimings::stopTimer(fftccppTimer);
@@ -370,7 +370,7 @@ int main(int argc, char *argv[])
   }
 
   testmsg << "In-place CC transform using layout with zeroth dim serial ..." << endl;
-  for (uint i=0; i<nLoop; i++) {
+  for (unsigned int i=0; i<nLoop; i++) {
     IpplTimings::startTimer(fftccpsTimer);
     ccfft.transform("forward", CFieldSPStan);
     IpplTimings::stopTimer(fftccpsTimer);
@@ -430,7 +430,7 @@ int main(int argc, char *argv[])
     rcfft.setDirectionName(-1, "inverse");
 
     testmsg << "RC transform using all-parallel layout ..." << endl;
-    for (uint i=0; i<nLoop; i++) {
+    for (unsigned int i=0; i<nLoop; i++) {
       IpplTimings::startTimer(fftrcppTimer);
       rcfft.transform("forward", RFieldPPStan, CFieldPPStan0h, constInput);
       IpplTimings::stopTimer(fftrcppTimer);
@@ -449,7 +449,7 @@ int main(int argc, char *argv[])
 
     testmsg << "RC transform using layout with zeroth dim serial ..." << endl;
 
-    for (uint i=0; i<nLoop; i++) {
+    for (unsigned int i=0; i<nLoop; i++) {
       IpplTimings::startTimer(fftrcpsTimer);
       rcfft.transform("forward", RFieldSPStan, CFieldSPStan0h, constInput);
       IpplTimings::stopTimer(fftrcpsTimer);

src/Solvers/MGPoissonSolver.h

@@ -182,7 +182,7 @@ private:
     Teuchos::RCP<const Comm_t> comm_mp;
 
     /// last N LHS's for extrapolating the new LHS as starting vector
-    uint nLHS_m;
+    unsigned int nLHS_m;
     Teuchos::RCP<TpetraMultiVector_t> P_mp;
     std::deque< TpetraVector_t > OldLHS;