From 5a03f36adc645ab932e10821f9b2533f44e41e4a Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Date: Mon, 9 Oct 2017 19:52:29 +0300
Subject: [PATCH] Fix compilation on gcc 4.6

Older versions of gcc do not support designated initializers.

Fixes 9a880ae67e2c ("Turn class Handler into struct space_vtab").
---
 src/box/memtx_space.cc    | 36 ++++++++++++++++++------------------
 src/box/sysview_engine.cc | 36 ++++++++++++++++++------------------
 src/box/vinyl_space.cc    | 36 ++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/box/memtx_space.cc b/src/box/memtx_space.cc
index b212b94f45..7344129fe2 100644
--- a/src/box/memtx_space.cc
+++ b/src/box/memtx_space.cc
@@ -789,22 +789,22 @@ memtx_space_commit_alter(struct space *old_space, struct space *new_space)
 /* }}} DDL */
 
 const struct space_vtab memtx_space_vtab = {
-	.destroy = memtx_space_destroy,
-	.bsize = memtx_space_bsize,
-	.apply_initial_join_row = memtx_space_apply_initial_join_row,
-	.execute_replace = memtx_space_execute_replace,
-	.execute_delete = memtx_space_execute_delete,
-	.execute_update = memtx_space_execute_update,
-	.execute_upsert = memtx_space_execute_upsert,
-	.execute_select = memtx_space_execute_select,
-	.init_system_space = memtx_init_system_space,
-	.check_index_def = memtx_space_check_index_def,
-	.create_index = memtx_space_create_index,
-	.add_primary_key = memtx_space_add_primary_key,
-	.drop_primary_key = memtx_space_drop_primary_key,
-	.build_secondary_key = memtx_space_build_secondary_key,
-	.prepare_truncate = memtx_space_prepare_truncate,
-	.commit_truncate = memtx_space_commit_truncate,
-	.prepare_alter = memtx_space_prepare_alter,
-	.commit_alter = memtx_space_commit_alter,
+	/* .destroy = */ memtx_space_destroy,
+	/* .bsize = */ memtx_space_bsize,
+	/* .apply_initial_join_row = */ memtx_space_apply_initial_join_row,
+	/* .execute_replace = */ memtx_space_execute_replace,
+	/* .execute_delete = */ memtx_space_execute_delete,
+	/* .execute_update = */ memtx_space_execute_update,
+	/* .execute_upsert = */ memtx_space_execute_upsert,
+	/* .execute_select = */ memtx_space_execute_select,
+	/* .init_system_space = */ memtx_init_system_space,
+	/* .check_index_def = */ memtx_space_check_index_def,
+	/* .create_index = */ memtx_space_create_index,
+	/* .add_primary_key = */ memtx_space_add_primary_key,
+	/* .drop_primary_key = */ memtx_space_drop_primary_key,
+	/* .build_secondary_key = */ memtx_space_build_secondary_key,
+	/* .prepare_truncate = */ memtx_space_prepare_truncate,
+	/* .commit_truncate = */ memtx_space_commit_truncate,
+	/* .prepare_alter = */ memtx_space_prepare_alter,
+	/* .commit_alter = */ memtx_space_commit_alter,
 };
diff --git a/src/box/sysview_engine.cc b/src/box/sysview_engine.cc
index dd3a08a381..77d029c7e3 100644
--- a/src/box/sysview_engine.cc
+++ b/src/box/sysview_engine.cc
@@ -148,24 +148,24 @@ sysview_space_commit_alter(struct space *, struct space *)
 }
 
 static const struct space_vtab sysview_space_vtab = {
-	.destroy = sysview_space_destroy,
-	.bsize = sysview_space_bsize,
-	.apply_initial_join_row = sysview_space_apply_initial_join_row,
-	.execute_replace = sysview_space_execute_replace,
-	.execute_delete = sysview_space_execute_delete,
-	.execute_update = sysview_space_execute_update,
-	.execute_upsert = sysview_space_execute_upsert,
-	.execute_select = generic_space_execute_select,
-	.init_system_space = sysview_init_system_space,
-	.check_index_def = sysview_space_check_index_def,
-	.create_index = sysview_space_create_index,
-	.add_primary_key = sysview_space_add_primary_key,
-	.drop_primary_key = sysview_space_drop_primary_key,
-	.build_secondary_key = sysview_space_build_secondary_key,
-	.prepare_truncate = sysview_space_prepare_truncate,
-	.commit_truncate = sysview_space_commit_truncate,
-	.prepare_alter = sysview_space_prepare_alter,
-	.commit_alter = sysview_space_commit_alter,
+	/* .destroy = */ sysview_space_destroy,
+	/* .bsize = */ sysview_space_bsize,
+	/* .apply_initial_join_row = */ sysview_space_apply_initial_join_row,
+	/* .execute_replace = */ sysview_space_execute_replace,
+	/* .execute_delete = */ sysview_space_execute_delete,
+	/* .execute_update = */ sysview_space_execute_update,
+	/* .execute_upsert = */ sysview_space_execute_upsert,
+	/* .execute_select = */ generic_space_execute_select,
+	/* .init_system_space = */ sysview_init_system_space,
+	/* .check_index_def = */ sysview_space_check_index_def,
+	/* .create_index = */ sysview_space_create_index,
+	/* .add_primary_key = */ sysview_space_add_primary_key,
+	/* .drop_primary_key = */ sysview_space_drop_primary_key,
+	/* .build_secondary_key = */ sysview_space_build_secondary_key,
+	/* .prepare_truncate = */ sysview_space_prepare_truncate,
+	/* .commit_truncate = */ sysview_space_commit_truncate,
+	/* .prepare_alter = */ sysview_space_prepare_alter,
+	/* .commit_alter = */ sysview_space_commit_alter,
 };
 
 SysviewEngine::SysviewEngine()
diff --git a/src/box/vinyl_space.cc b/src/box/vinyl_space.cc
index a63893ffa3..c21c5148bd 100644
--- a/src/box/vinyl_space.cc
+++ b/src/box/vinyl_space.cc
@@ -293,22 +293,22 @@ vinyl_space_commit_alter(struct space *old_space, struct space *new_space)
 /* }}} DDL */
 
 const struct space_vtab vinyl_space_vtab = {
-	.destroy = vinyl_space_destroy,
-	.bsize = vinyl_space_bsize,
-	.apply_initial_join_row = vinyl_space_apply_initial_join_row,
-	.execute_replace = vinyl_space_execute_replace,
-	.execute_delete = vinyl_space_execute_delete,
-	.execute_update = vinyl_space_execute_update,
-	.execute_upsert = vinyl_space_execute_upsert,
-	.execute_select = generic_space_execute_select,
-	.init_system_space = vinyl_init_system_space,
-	.check_index_def = vinyl_space_check_index_def,
-	.create_index = vinyl_space_create_index,
-	.add_primary_key = vinyl_space_add_primary_key,
-	.drop_primary_key = vinyl_space_drop_primary_key,
-	.build_secondary_key = vinyl_space_build_secondary_key,
-	.prepare_truncate = vinyl_space_prepare_truncate,
-	.commit_truncate = vinyl_space_commit_truncate,
-	.prepare_alter = vinyl_space_prepare_alter,
-	.commit_alter = vinyl_space_commit_alter,
+	/* .destroy = */ vinyl_space_destroy,
+	/* .bsize = */ vinyl_space_bsize,
+	/* .apply_initial_join_row = */ vinyl_space_apply_initial_join_row,
+	/* .execute_replace = */ vinyl_space_execute_replace,
+	/* .execute_delete = */ vinyl_space_execute_delete,
+	/* .execute_update = */ vinyl_space_execute_update,
+	/* .execute_upsert = */ vinyl_space_execute_upsert,
+	/* .execute_select = */ generic_space_execute_select,
+	/* .init_system_space = */ vinyl_init_system_space,
+	/* .check_index_def = */ vinyl_space_check_index_def,
+	/* .create_index = */ vinyl_space_create_index,
+	/* .add_primary_key = */ vinyl_space_add_primary_key,
+	/* .drop_primary_key = */ vinyl_space_drop_primary_key,
+	/* .build_secondary_key = */ vinyl_space_build_secondary_key,
+	/* .prepare_truncate = */ vinyl_space_prepare_truncate,
+	/* .commit_truncate = */ vinyl_space_commit_truncate,
+	/* .prepare_alter = */ vinyl_space_prepare_alter,
+	/* .commit_alter = */ vinyl_space_commit_alter,
 };
-- 
GitLab