X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=grpc-proxy%2Fmain-grpc.cpp;h=db3303270d0376051186924d204b23641dee2e3f;hb=ec6f2d31293d8680a1f6dab8f53949b848bbae08;hp=92d4862fa02e685c4580a10a7f251ae761cee512;hpb=09fa5536e759792c80341305a536cd59aa801c6d;p=src%2Fagl-compositor.git

diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp
index 92d4862..db33032 100644
--- a/grpc-proxy/main-grpc.cpp
+++ b/grpc-proxy/main-grpc.cpp
@@ -272,9 +272,8 @@ global_remove(void *data, struct wl_registry *reg, uint32_t id)
 	(void) id;
 
 	for (std::list<global_data>::iterator it = sh->globals.begin();
-			it != sh->globals.end(); it++) {
-		sh->globals.erase(it);
-	}
+			it != sh->globals.end(); it = sh->globals.erase(it))
+		;
 }
 
 static const struct wl_registry_listener registry_listener = {
@@ -395,9 +394,8 @@ destroy_shell_data(struct shell_data *sh)
                 destroy_output(w_output);
 
        for (std::list<global_data>::iterator it = sh->globals.begin();
-		       it != sh->globals.end(); it++) {
-	       sh->globals.erase(it);
-       }
+		       it != sh->globals.end(); it = sh->globals.erase(it))
+	       ;
 
         wl_display_flush(sh->wl_display);
         wl_display_disconnect(sh->wl_display);