projects
/
iotcloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compile errors
[iotcloud.git]
/
version2
/
src
/
C
/
SlotBuffer.cc
diff --git
a/version2/src/C/SlotBuffer.cc
b/version2/src/C/SlotBuffer.cc
index 248abd78017f03237e0f74cd8cf5bfc8403ad962..2ce4a66147b20a2091126ed83cf4d0dc38faeadd 100644
(file)
--- a/
version2/src/C/SlotBuffer.cc
+++ b/
version2/src/C/SlotBuffer.cc
@@
-28,7
+28,7
@@
int SlotBuffer::capacity() {
}
void SlotBuffer::resize(int newsize) {
}
void SlotBuffer::resize(int newsize) {
- if (newsize == (array->length() - 1))
+ if (
(uint32_t)
newsize == (array->length() - 1))
return;
Array<Slot *> *newarray = new Array<Slot *>(newsize + 1);
return;
Array<Slot *> *newarray = new Array<Slot *>(newsize + 1);
@@
-36,7
+36,7
@@
void SlotBuffer::resize(int newsize) {
int index = tail;
for (int i = 0; i < currsize; i++) {
newarray->set(i, array->get(index));
int index = tail;
for (int i = 0; i < currsize; i++) {
newarray->set(i, array->get(index));
- if ((++index) == array->length())
+ if ((
(uint32_t)
++index) == array->length())
index = 0;
}
array = newarray;
index = 0;
}
array = newarray;
@@
-46,13
+46,13
@@
void SlotBuffer::resize(int newsize) {
void SlotBuffer::incrementHead() {
head++;
void SlotBuffer::incrementHead() {
head++;
- if (
head
>= array->length())
+ if (
((uint32_t)head)
>= array->length())
head = 0;
}
void SlotBuffer::incrementTail() {
tail++;
head = 0;
}
void SlotBuffer::incrementTail() {
tail++;
- if (
tail
>= array->length())
+ if (
((uint32_t)tail)
>= array->length())
tail = 0;
}
tail = 0;
}
@@
-88,14
+88,14
@@
Slot *SlotBuffer::getSlot(int64_t seqnum) {
return NULL;
}
return NULL;
}
- if (
index
>= array->length()) {
+ if (
((uint32_t)index)
>= array->length()) {
if (head >= tail) {
return NULL;
}
if (head >= tail) {
return NULL;
}
- index -= array->length();
+ index -=
(int32_t)
array->length();
}
}
- if (
index
>= array->length()) {
+ if (
((uint32_t)index)
>= array->length()) {
return NULL;
}
return NULL;
}