erase from std::list

Author: camilleg

gran/granActor.c++

@@ -232,9 +232,9 @@ void granActor::unloadFile(char* dirName, char* fName) {
         	if ((*it)->unused()) {
         		delete *it;
         		fileList.erase(it);
-        	}
-        	else
-        		fprintf(stderr, "vss: granActor can't unload soundfile %s because it's still in use.\n", fName);
+			} else {
+				fprintf(stderr, "vss: granActor file \"%s\" is still in use.\n", fName);
+			}
        		return;
        	}
 	}
@@ -245,12 +245,18 @@ void granActor::unloadFile(char* dirName, char* fName) {
 // (may crash, unless from the destructor, which then deletes the
 // VAlgorithms that are using these sfiles).
 void granActor::unloadAllFiles(int beFirm) {
-    for (auto it = fileList.begin(); it != fileList.end(); ++it) {
-        if (beFirm || (*it)->unused()) {
-        	delete *it;
-        	fileList.erase(it--);
-        } else {
+	if (beFirm) {
+		for (auto f: fileList) delete f;
+		fileList.clear();
+		return;
+	}
+    for (auto it = fileList.begin(); it != fileList.end();) {
+		if ((*it)->unused()) {
+			delete *it;
+			it = fileList.erase(it); // works with either list or vector
+		} else {
         	fprintf(stderr, "vss: granActor file %s is still in use.\n", (*it)->name());
+			++it;
 		}
 	}
 }

later/laterActor.c++

@@ -5,17 +5,18 @@ LaterActor::LaterActor() {
 	setTypeName("LaterActor");
 }
 
-LaterActor::~LaterActor() {}
-
 // Send and delete all messages whose time has come.
+// Like MessageGroup::act().
 void LaterActor::act()
 {
 	VActor::act();
 	const auto now = currentTime();
-	for (auto it = messageList.begin(); it != messageList.end(); ++it) {
+	for (auto it = messageList.begin(); it != messageList.end();) {
 		if (now >= it->time) {
 			actorMessageHandler(it->msg);
-			messageList.erase(it--);
+			it = messageList.erase(it);
+		} else {
+			++it;
 		}
 	}
 }

later/laterActor.h

@@ -6,11 +6,9 @@
 class LaterActor : public VActor	
 {
 	using Event = struct { float time; char msg[128]; };
-	using EventList = std::list<Event>;
-	EventList messageList;
+	std::list<Event> messageList;
 public:
 	LaterActor();
-	~LaterActor();
 	void act();
 	int receiveMessage(const char*);
 	void addMessage(float, char*);

msg/messageGroup.c++

@@ -432,14 +432,17 @@ int MessageGroup::receiveMessage(const char* Message)
 }
 
 // Process and delete all delayed data arrays whose time has come.
+// Like LaterActor::act().
 void MessageGroup::act()
 {
 	VActor::act();
 	const auto now = currentTime();
-	for (auto it = dataList.begin(); it != dataList.end(); ++it) {
+	for (auto it = dataList.begin(); it != dataList.end();) {
 		if (now >= (*it)->time) {
 			receiveData((*it)->data, (*it)->size);
-			dataList.erase(it--);
+			it = dataList.erase(it);
+		} else {
+			++it;
 		}
 	}
 }

msg/messageGroup.h

@@ -6,25 +6,20 @@
 #include <list>
 
 // Parameterized messages.
-class ParamMsg
-{
-public:
+struct ParamMsg {
 	char msg[256];
-	ParamMsg() { msg[0] = '\0'; }
+	ParamMsg() = delete;
 	ParamMsg(char* m) { strcpy(msg, m); }
-	~ParamMsg()	{}
 };
 
 // Store arrays to be received (handled) later.
-class DelayedData
-{
-public:
+struct DelayedData {
 	float* data;
 	int size;
 	float time;
-	DelayedData(): data(NULL), size(0), time(0.) {}
+	DelayedData(): data(nullptr), size(0), time(0.0) {}
 	DelayedData(float t, float* d, int s) : data(d), size(s), time(t) {}
-	~DelayedData() { delete[] data; }
+	~DelayedData() { delete [] data; }
 };
 
 // ParticleActor derives from this, hence the virtuals.
@@ -69,8 +64,7 @@ class MessageGroup : public VActor
 	virtual void receiveScheduledData(float, float*, int);
 	virtual void endReceiveSchedule(int) {}
 
-	using DelayedDataList = std::list<DelayedData*>;
-	DelayedDataList dataList;
+	std::list<DelayedData*> dataList;
 
 public:
 	virtual void act();

samp/sampActor.c++

@@ -199,26 +199,32 @@ void sampActor::unloadFile(char* dirName, char* fName) {
         	if ((*it)->unused()) {
         		delete *it;
         		fileList.erase(it);
-        	}
-        	else
-        		printf("vss error: SampleActor file \"%s\" is still in use.\n", fName);
+			} else {
+				fprintf(stderr, "vss: SampleActor file \"%s\" is still in use.\n", fName);
+			}
        		return;
        	}
 	}
-	printf("vss warning: SampleActor did not find %s to unload.\n", fName);
+	fprintf(stderr, "vss: SampleActor did not find %s to unload.\n", fName);
 }
 
 
 // Unload files not still in use.  If beFirm, unload all files
 // (may crash, unless from the destructor, which then deletes the
 // VAlgorithms that are using these sfiles).
 void sampActor::unloadAllFiles(int beFirm) {
-	for (auto it = fileList.begin(); it != fileList.end(); it++) {
-		if (beFirm || (*it)->unused()) {
+	if (beFirm) {
+		for (auto f: fileList) delete f;
+		fileList.clear();
+		return;
+	}
+    for (auto it = fileList.begin(); it != fileList.end();) {
+		if ((*it)->unused()) {
 			delete *it;
-            fileList.erase(it--);
+			it = fileList.erase(it); // works with either list or vector
 		} else {
-			printf("vss error: SampleActor file %s is still in use.\n", (*it)->name());
+			fprintf(stderr, "vss: SampleActor file %s is still in use.\n", (*it)->name());
+			++it;
 		}
 	}
 }