From 4753ae87285f07a9060a2bafabcc519b03b797ae Mon Sep 17 00:00:00 2001
From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Mon, 12 May 2014 00:06:55 +0200
Subject: [PATCH] test_rgw_admin_log.cc: prefer ++operators for iterators

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---
 src/test/test_rgw_admin_log.cc | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index dd125551c06a..c46a1f34e998 100644
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -791,7 +791,7 @@ TEST(TestRGWAdmin, datalog_list) {
     list<rgw_data_change>::iterator it = (entries.begin());
     EXPECT_EQ((*it).entity_type, ENTITY_TYPE_BUCKET);
     EXPECT_EQ((*it).key.compare(TEST_BUCKET_NAME), 0);
-    it++; 
+    ++it; 
     EXPECT_EQ((*it).entity_type, ENTITY_TYPE_BUCKET);
     EXPECT_EQ((*it).key.compare(TEST_BUCKET_NAME), 0);
   }
@@ -1082,15 +1082,15 @@ TEST(TestRGWAdmin, mdlog_list) {
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("write") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("write") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
@@ -1116,15 +1116,15 @@ TEST(TestRGWAdmin, mdlog_list) {
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("write") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("write") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
@@ -1152,14 +1152,14 @@ TEST(TestRGWAdmin, mdlog_list) {
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("remove") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("write") == 0);
-    it++;
+    ++it;
     EXPECT_TRUE(it->section.compare("user") == 0);
     EXPECT_TRUE(it->name.compare(uid) == 0);
     EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
@@ -1417,7 +1417,7 @@ TEST(TestRGWAdmin, bilog_list) {
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
     EXPECT_EQ(it->status.compare("pending"), 0);
     EXPECT_EQ(it->index_ver, 1U);
-    it++;
+    ++it;
     EXPECT_EQ(it->op.compare("write"), 0);
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
     EXPECT_EQ(it->status.compare("complete"), 0);
@@ -1444,12 +1444,12 @@ TEST(TestRGWAdmin, bilog_list) {
   if (entries.size() == 4) {
     list<cls_bilog_entry>::iterator it = entries.begin();
 
-    it++; it++;
+    ++it; ++it;
     EXPECT_EQ(it->op.compare("write"), 0);
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT_1), 0);
     EXPECT_EQ(it->status.compare("pending"), 0);
     EXPECT_EQ(it->index_ver, 3U);
-    it++;
+    ++it;
     EXPECT_EQ(it->op.compare("write"), 0);
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT_1), 0);
     EXPECT_EQ(it->status.compare("complete"), 0);
@@ -1468,13 +1468,13 @@ TEST(TestRGWAdmin, bilog_list) {
   if (entries.size() == 6) {
     list<cls_bilog_entry>::iterator it = entries.begin();
     
-    it++; it++; it++; it++;
+    ++it; ++it; ++it; ++it;
     marker = it->op_id;
     EXPECT_EQ(it->op.compare("del"), 0);
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
     EXPECT_EQ(it->status.compare("pending"), 0);
     EXPECT_EQ(it->index_ver, 5U);
-    it++;
+    ++it;
     EXPECT_EQ(it->op.compare("del"), 0);
     EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
     EXPECT_EQ(it->status.compare("complete"), 0);
@@ -1492,7 +1492,7 @@ TEST(TestRGWAdmin, bilog_list) {
   if (entries.size() == 2U) {
     list<cls_bilog_entry>::iterator it = entries.begin();
     EXPECT_EQ(it->index_ver, 5U);
-    it++;
+    ++it;
     EXPECT_EQ(it->index_ver, 6U);
     EXPECT_EQ(it->op.compare("del"), 0);
   }
@@ -1555,7 +1555,7 @@ TEST(TestRGWAdmin, bilog_trim) {
 
   list<cls_bilog_entry>::iterator it = entries.begin();
   start_marker = it->op_id;
-  it++;
+  ++it;
   end_marker = it->op_id;
 
   rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
-- 
2.47.3