Compiles w/o warnings

diff --git a/version2/src/C/IoTString.h b/version2/src/C/IoTString.h
index bd838bb3ce8626634998ce586d8f55a3ff99cbbc..2d7a14f9ef476b967ac79baef03a0464f199d7dd 100644 (file)
--- a/version2/src/C/IoTString.h
+++ b/version2/src/C/IoTString.h
@@ -82,7 +82,7 @@ public:
        friend IoTString *IoTString_shallow(Array<char> *_array);
 };
 
        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;
        IoTString *str = new IoTString();
        str->array = _array;
        return str;

diff --git a/version2/src/C/SlotIndexer.cc b/version2/src/C/SlotIndexer.cc
index e3b7fa76478cc95780a2ec59b98b11c2e14cadca..c3633188f141cf20d1ec4c19b19a633c00df0ca1 100644 (file)
--- a/version2/src/C/SlotIndexer.cc
+++ b/version2/src/C/SlotIndexer.cc
@@ -10,8 +10,8 @@
  */
 
 SlotIndexer::SlotIndexer(Array<Slot *> *_updates, SlotBuffer *_buffer) :
  */
 
 SlotIndexer::SlotIndexer(Array<Slot *> *_updates, SlotBuffer *_buffer) :

-       buffer(_buffer),

        updates(_updates),
        updates(_updates),

+       buffer(_buffer),

        firstslotseqnum(updates->get(0)->getSequenceNumber()) {
 }
 
        firstslotseqnum(updates->get(0)->getSequenceNumber()) {
 }
 

diff --git a/version2/src/C/Table.cc b/version2/src/C/Table.cc
index d3b7e53773cef47d0e11d01486f13beaa918b743..835b9db7b4e4a44fcd6ee52571af0073fe3f4781 100644 (file)
--- a/version2/src/C/Table.cc
+++ b/version2/src/C/Table.cc
@@ -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();
         * 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
        for (; seqn <= newestseqnum; seqn++) {
                Slot *prevslot = buffer->getSlot(seqn);
                //Push slot number forward