Compiles w/o warnings
authorbdemsky <bdemsky@uci.edu>
Fri, 2 Mar 2018 08:34:53 +0000 (00:34 -0800)
committerbdemsky <bdemsky@uci.edu>
Fri, 2 Mar 2018 08:34:53 +0000 (00:34 -0800)
version2/src/C/IoTString.h
version2/src/C/SlotIndexer.cc
version2/src/C/Table.cc

index bd838bb..2d7a14f 100644 (file)
@@ -82,7 +82,7 @@ public:
        friend IoTString *IoTString_shallow(Array<char> *_array);
 };
 
-IoTString *IoTString_shallow(Array<char> *_array) {
+inline IoTString *IoTString_shallow(Array<char> *_array) {
        IoTString *str = new IoTString();
        str->array = _array;
        return str;
index e3b7fa7..c363318 100644 (file)
@@ -10,8 +10,8 @@
  */
 
 SlotIndexer::SlotIndexer(Array<Slot *> *_updates, SlotBuffer *_buffer) :
-       buffer(_buffer),
        updates(_updates),
+       buffer(_buffer),
        firstslotseqnum(updates->get(0)->getSequenceNumber()) {
 }
 
index d3b7e53..835b9db 100644 (file)
@@ -1388,7 +1388,6 @@ void Table::doOptionalRescue(Slot *s, bool seenliveslot, int64_t seqn, bool resi
         * for SKIP_THRESHOLD consecutive entries*/
        int skipcount = 0;
        int64_t newestseqnum = buffer->getNewestSeqNum();
-search:
        for (; seqn <= newestseqnum; seqn++) {
                Slot *prevslot = buffer->getSlot(seqn);
                //Push slot number forward