Changed erase to use C++11 version, requires C++11

Mantevo · Aug 24, 2017 · a5e1677 · a5e1677
1 parent 3c6063b
commit a5e1677
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git a/miniTri/linearAlgebra/HPX3/CSRMatrix.cc b/miniTri/linearAlgebra/HPX3/CSRMatrix.cc
@@ -401,7 +401,8 @@ int matmat_ComputeRowBlock(const CSRMat &A, const CSRMat &B, blockDS blockInfo,
     {
       if((*iter).second.size()==1)
       {
-        newNZs.erase(iter++); // Remove nonzero
+        // newNZs.erase(iter++);   // Remove nonzero (C++98 Compliant)
+	iter = newNZs.erase(iter); // Remove nonzero (C++11 Compliant)
         nnzInRow[rownum]--;   // One less nonzero in row
       }
       else

diff --git a/miniTri/linearAlgebra/MPI/CSRMatrix.cpp b/miniTri/linearAlgebra/MPI/CSRMatrix.cpp
@@ -60,7 +60,7 @@
 #include <cassert>
 #include <cstdlib>
 
-#include "CSRmatrix.hpp"
+#include "CSRMatrix.hpp"
 #include "Vector.hpp"
 #include "mmUtil.h"
 #include "binFileReader.h"
@@ -378,7 +378,8 @@ void CSRMat::matmat(const CSRMat &A, const CSRMat &B)
       {
         if((*iter).second.size()==1)
         {
-          CNZs[submatNum][rownum].erase(iter++); // Remove nonzero
+          //CNZs[submatNum][rownum].erase(iter++);      // Remove nonzero (C++98 Compliant)
+	  iter = CNZs[submatNum][rownum].erase(iter); // Remove nonzero (C++11 Required)
         }
         else
         {

diff --git a/miniTri/linearAlgebra/MPI/Graph.hpp b/miniTri/linearAlgebra/MPI/Graph.hpp
@@ -59,7 +59,7 @@
 #include <cmath>
 #include <memory>
 
-#include "CSRmatrix.hpp"
+#include "CSRMatrix.hpp"
 #include "Vector.hpp"
 
 //////////////////////////////////////////////////////////////////////////////

diff --git a/miniTri/linearAlgebra/MPI/Makefile b/miniTri/linearAlgebra/MPI/Makefile
@@ -12,7 +12,7 @@
 UTILDIR = ../../utils/
 INCDIRS = -I. -I$(UTILDIR)
 CCC = mpicxx
-CCFLAGS = -O3 -Wall -DNDEBUG -DUSE_MPI 
+CCFLAGS = -O3 -Wall -DNDEBUG -DUSE_MPI -std=c++11
 LIBPATH = -L. 
 
 #--------------------------------------------------
@@ -40,12 +40,12 @@ vpath %.cc $(UTILDIR)
 vpath %.cpp $(UTILDIR)
 
 all 		:	lib miniTri 
-matrix.o	:	CSRmatrix.h 
+matrix.o	:	CSRMatrix.hpp
 
 lib		:	 $(LIBOBJECTS) $(UTILOBJECTS)
 	ar rvu libSPLA.a $(LIBOBJECTS) $(UTILOBJECTS)
 
-miniTri	:	lib CSRmatrix.hpp Graph.hpp
+miniTri	:	lib CSRMatrix.hpp Graph.hpp
 	$(CCC) $(INCDIRS) $(LIBPATH) $(CCFLAGS) -o miniTri.exe miniTri.cpp -lSPLA 
 
 clean	:

diff --git a/miniTri/linearAlgebra/openmp/CSRMatrix.cc b/miniTri/linearAlgebra/openmp/CSRMatrix.cc
@@ -234,7 +234,9 @@ void CSRMat::matmat(const CSRMat &A, const CSRMat &B)
     {
       if((*iter).second.size()==1)
       {
-        newNZs.erase(iter++); // Remove nonzero
+        // newNZs.erase(iter++);   // Remove nonzero (C++98 Compliant)
+	iter = newNZs.erase(iter); // Remove nonzero (C++11 Required)
+
 	nnzInRow[rownum]--;   // One less nonzero in row
       }
       else

diff --git a/miniTri/linearAlgebra/openmp/Makefile b/miniTri/linearAlgebra/openmp/Makefile
@@ -11,7 +11,7 @@
 UTILDIRS = ../../utils/
 INCDIRS = -I. -I$(UTILDIRS)
 CCC = g++ 
-CCFLAGS = -O3 -Wall -DNDEBUG -fopenmp -std=c++11 $(BOOSTCCFLAGS)
+CCFLAGS = -O3 -Wall -DNDEBUG -fopenmp -std=c++11 
 LIBPATH = -L. 
 
 

diff --git a/miniTri/linearAlgebra/serial/CSRmatrix.cpp b/miniTri/linearAlgebra/serial/CSRmatrix.cpp
@@ -216,7 +216,9 @@ void CSRMat::matmat(const CSRMat &A, const CSRMat &B)
     {
       if((*iter).second.size()==1)
       {
-        newNZs.erase(iter++); // Remove nonzero
+        //newNZs.erase(iter++); // Remove nonzero (C++98 compliant)
+	iter = newNZs.erase(iter); // Remove nonzero (requires C++11)
+
         nnzInRow[rownum]--;   // One less nonzero in row
       }
       else

diff --git a/miniTri/linearAlgebra/serial/Makefile b/miniTri/linearAlgebra/serial/Makefile
@@ -12,7 +12,7 @@
 UTILDIR = ../../utils/
 INCDIRS = -I. -I$(UTILDIR)
 CCC = g++ 
-CCFLAGS = -O3 -Wall -DNDEBUG
+CCFLAGS = -O3 -Wall -DNDEBUG -std=c++11
 LIBPATH = -L. 
 
 #--------------------------------------------------

diff --git a/triangleCounting/linearAlgebra/LH/openmp/CSRMatrix.cc b/triangleCounting/linearAlgebra/LH/openmp/CSRMatrix.cc
@@ -143,7 +143,8 @@ void CSRMat::matmat(const CSRMat &A, const CSRMat &B)
     {
       if((*iter).second==1)
       {
-        newNZs.erase(iter++); // Remove nonzero
+	// newNZs.erase(iter++);   // Remove nonzero (C++98 Compliant)
+        iter = newNZs.erase(iter); // Remove nonzero (Requires C++11)
 	nnzInRow[rownum]--;   // One less nonzero in row
       }
       else

diff --git a/triangleCounting/linearAlgebra/LH/serial/CSRmatrix.cpp b/triangleCounting/linearAlgebra/LH/serial/CSRmatrix.cpp
@@ -145,7 +145,8 @@ void CSRMat::matmat(const CSRMat &A, const CSRMat &B)
     {
       if((*iter).second==1)
       {
-        newNZs.erase(iter++); // Remove nonzero
+	// newNZs.erase(iter++);   // Remove nonzero (C++98 Compliant)
+        iter = newNZs.erase(iter); // Remove nonzero (C++11 Required)
         nnzInRow[rownum]--;   // One less nonzero in row
       }
       else