Author: rhs
Date: Tue Apr 8 19:09:26 2014
New Revision: 1585817
URL: http://svn.apache.org/r1585817
Log:
PROTON-545: hopefully fixed conversion warning
Modified:
qpid/proton/trunk/proton-c/src/object/object.c
Modified: qpid/proton/trunk/proton-c/src/object/object.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/object/object.c?rev=1585817&r1=1585816&r2=1585817&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/object/object.c (original)
+++ qpid/proton/trunk/proton-c/src/object/object.c Tue Apr 8 19:09:26 2014
@@ -484,17 +484,21 @@ size_t pn_map_size(pn_map_t *map)
return map->size;
}
+static float pni_map_load(pn_map_t *map)
+{
+ return ((float) map->size) / ((float) map->addressable);
+}
+
static bool pni_map_ensure(pn_map_t *map, size_t capacity)
{
- float load = map->size / map->addressable;
+ float load = pni_map_load(map);
if (capacity <= map->capacity && load < map->load_factor) {
return false;
}
size_t oldcap = map->capacity;
- while (map->capacity < capacity ||
- (map->size / map->addressable) > map->load_factor) {
+ while (map->capacity < capacity || pni_map_load(map) > map->load_factor) {
map->capacity *= 2;
map->addressable = (size_t) (0.86 * map->capacity);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
