Rename collection args to itr in pdal/capi/PointViewIterator.cpp

jimmysoda · jimmysoda · commit 6577774166f0 · 2018-06-27T14:48:45.000-04:00
diff --git a/source/pdal/capi/PointViewIterator.cpp b/source/pdal/capi/PointViewIterator.cpp
@@ -31,15 +31,15 @@ namespace pdal
 
 		extern "C"
 		{
-			bool PDALHasNextPointView(PDALPointViewIteratorPtr collection)
+			bool PDALHasNextPointView(PDALPointViewIteratorPtr itr)
 			{
-				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);
 				return ptr && ptr->hasNext();
 			}
 
-			PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr collection)
+			PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr itr)
 			{
-				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);
 				PDALPointViewPtr view = nullptr;
 
 				if (ptr)
@@ -55,25 +55,25 @@ namespace pdal
 				return view;
 			}
 
-			void PDALResetPointViewIterator(PDALPointViewIteratorPtr collection)
+			void PDALResetPointViewIterator(PDALPointViewIteratorPtr itr)
 			{
-				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);
 
 				if (ptr)
 				{
 					ptr->reset();
 				}
 			}
 
-			void PDALDisposePointViewIterator(PDALPointViewIteratorPtr collection)
+			void PDALDisposePointViewIterator(PDALPointViewIteratorPtr itr)
 			{
-				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);
 
 				if (ptr)
 				{
 					delete ptr;
 					ptr = nullptr;
-					collection = nullptr;
+					itr = nullptr;
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ namespace pdal`
`31`	`31`
`32`	`32`	`extern "C"`
`33`	`33`	`{`
`34`		`- bool PDALHasNextPointView(PDALPointViewIteratorPtr collection)`
	`34`	`+ bool PDALHasNextPointView(PDALPointViewIteratorPtr itr)`
`35`	`35`	`{`
`36`		`- auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);`
	`36`	`+ auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);`
`37`	`37`	`return ptr && ptr->hasNext();`
`38`	`38`	`}`
`39`	`39`
`40`		`- PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr collection)`
	`40`	`+ PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr itr)`
`41`	`41`	`{`
`42`		`- auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);`
	`42`	`+ auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);`
`43`	`43`	`PDALPointViewPtr view = nullptr;`
`44`	`44`
`45`	`45`	`if (ptr)`
`@@ -55,25 +55,25 @@ namespace pdal`
`55`	`55`	`return view;`
`56`	`56`	`}`
`57`	`57`
`58`		`- void PDALResetPointViewIterator(PDALPointViewIteratorPtr collection)`
	`58`	`+ void PDALResetPointViewIterator(PDALPointViewIteratorPtr itr)`
`59`	`59`	`{`
`60`		`- auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);`
	`60`	`+ auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);`
`61`	`61`
`62`	`62`	`if (ptr)`
`63`	`63`	`{`
`64`	`64`	`ptr->reset();`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- void PDALDisposePointViewIterator(PDALPointViewIteratorPtr collection)`
	`68`	`+ void PDALDisposePointViewIterator(PDALPointViewIteratorPtr itr)`
`69`	`69`	`{`
`70`		`- auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);`
	`70`	`+ auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(itr);`
`71`	`71`
`72`	`72`	`if (ptr)`
`73`	`73`	`{`
`74`	`74`	`delete ptr;`
`75`	`75`	`ptr = nullptr;`
`76`		`- collection = nullptr;`
	`76`	`+ itr = nullptr;`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`