All of lore.kernel.org
 help / color / mirror / Atom feed
From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
To: ceph-devel@vger.kernel.org
Cc: Danny Al-Gaaf <dalgaaf@suse.de>, Sage Weil <sage@inktank.com>
Subject: [PATCH 01/15] kv_flat_btree_async.cc: use vector instead of VLA's
Date: Thu,  7 Feb 2013 20:41:49 +0100	[thread overview]
Message-ID: <1360266123-28972-2-git-send-email-danny.al-gaaf@bisect.de> (raw)
In-Reply-To: <1360266123-28972-1-git-send-email-danny.al-gaaf@bisect.de>

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@bisect.de>
---
 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


  reply	other threads:[~2013-02-07 19:42 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-07 19:41 [PATCH 00/15] fix more issues from clang(++) and cppchecker Danny Al-Gaaf
2013-02-07 19:41 ` Danny Al-Gaaf [this message]
2013-02-10  5:57   ` [PATCH 01/15] kv_flat_btree_async.cc: use vector instead of VLA's Sage Weil
2013-02-11 13:21     ` Danny Al-Gaaf
2013-02-11 13:57       ` Sage Weil
2013-02-07 19:41 ` [PATCH 02/15] common/config.h: declaration of config_option as struct Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 03/15] src/msg/msg_types.h: pass function parameter by reference Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 04/15] fuse_ll.cc: fix -Wgnu-designator Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 05/15] common/AsyncReserver.h: use empty() instead of size() Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 06/15] common/WorkQueue.h: " Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 07/15] common/config.cc: fix -Wgnu-designator Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 08/15] src/log/Entry.h: pass function parameter by reference Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 09/15] src/mon/PGMonitor.cc: remove unused variable Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 10/15] src/msg/Messenger.h: pass function parameter by reference Danny Al-Gaaf
2013-02-07 19:41 ` [PATCH 11/15] src/osd/OSD.h: use empty() instead of size() Danny Al-Gaaf
2013-02-07 19:42 ` [PATCH 12/15] src/osd/PG.h: " Danny Al-Gaaf
2013-02-07 19:42 ` [PATCH 13/15] src/osd/osd_types.h: pass function parameter by reference Danny Al-Gaaf
2013-02-10  6:00   ` Sage Weil
2013-02-07 19:42 ` [PATCH 14/15] test_mon_workloadgen.cc: fix -Wgnu Danny Al-Gaaf
2013-02-07 19:42 ` [PATCH 15/15] librados/librados.cc: fix implicitly-defined namespace 'std' Danny Al-Gaaf
2013-02-10  6:02 ` [PATCH 00/15] fix more issues from clang(++) and cppchecker Sage Weil
2013-02-10 13:38   ` Danny Al-Gaaf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360266123-28972-2-git-send-email-danny.al-gaaf@bisect.de \
    --to=danny.al-gaaf@bisect.de \
    --cc=ceph-devel@vger.kernel.org \
    --cc=dalgaaf@suse.de \
    --cc=sage@inktank.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.