Fix "variable length array of non-POD element type" errors caused by
using librados::ObjectWriteOperation VLAs. (-Wvla)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@xxxxxxxxx>
---
src/key_value_store/kv_flat_btree_async.cc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc
index 96c6cb0..4342e70 100644
--- a/src/key_value_store/kv_flat_btree_async.cc
+++ b/src/key_value_store/kv_flat_btree_async.cc
@@ -1119,9 +1119,9 @@ int KvFlatBtreeAsync::cleanup(const index_data &idata, const int &errno) {
//all changes were created except for updating the index and possibly
//deleting the objects. roll forward.
vector<pair<pair<int, string>, librados::ObjectWriteOperation*> > ops;
- librados::ObjectWriteOperation owos[idata.to_delete.size() + 1];
+ vector<librados::ObjectWriteOperation*> owos(idata.to_delete.size() + 1);
for (int i = 0; i <= (int)idata.to_delete.size(); ++i) {
- ops.push_back(make_pair(pair<int, string>(0, ""), &owos[i]));
+ ops.push_back(make_pair(pair<int, string>(0, ""), owos[i]));
}
set_up_ops(vector<object_data>(),
vector<object_data>(), &ops, idata, &err);
@@ -1883,23 +1883,23 @@ int KvFlatBtreeAsync::set_many(const map<string, bufferlist> &in_map) {
to_create[to_create.size() - 1].max_kdata =
to_delete[to_delete.size() - 1].max_kdata;
- librados::ObjectWriteOperation owos[2 + 2 * to_delete.size()
- + to_create.size()];
+ vector<librados::ObjectWriteOperation*> owos(2 + 2 * to_delete.size()
+ + to_create.size());
vector<pair<pair<int, string>, librados::ObjectWriteOperation*> > ops;
index_data idata;
- set_up_prefix_index(to_create, to_delete, &owos[0], &idata, &err);
+ set_up_prefix_index(to_create, to_delete, owos[0], &idata, &err);
if (verbose) cout << "finished making to_create and to_delete. "
<< std::endl;
ops.push_back(make_pair(
pair<int, string>(ADD_PREFIX, index_name),
- &owos[0]));
+ owos[0]));
for (int i = 1; i < 2 + 2 * (int)to_delete.size() + (int)to_create.size();
i++) {
- ops.push_back(make_pair(make_pair(0,""), &owos[i]));
+ ops.push_back(make_pair(make_pair(0,""), owos[i]));
}
set_up_ops(to_create, to_delete, &ops, idata, &err);
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
