A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[windows] fix the detection of 32/64 bits
[simgrid.git]
/
src
/
xbt
/
setset.c
diff --git
a/src/xbt/setset.c
b/src/xbt/setset.c
index
056fb82
..
8dbf6ec
100644
(file)
--- a/
src/xbt/setset.c
+++ b/
src/xbt/setset.c
@@
-1,9
+1,15
@@
+/* Copyright (c) 2010-2012, 2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include "setset_private.h"
#include "xbt/sysdep.h"
#include <stddef.h>
#include <stdio.h>
#include <string.h>
#include "setset_private.h"
#include "xbt/sysdep.h"
-#include "
gras
_config.h" /*_XBT_WIN32*/
+#include "
internal
_config.h" /*_XBT_WIN32*/
/*The function ffs doesn't exist for windows*/
#ifdef _XBT_WIN32
/*The function ffs doesn't exist for windows*/
#ifdef _XBT_WIN32
@@
-195,7
+201,7
@@
void xbt_setset_set_reset(xbt_setset_set_t set)
*/
void *xbt_setset_set_choose(xbt_setset_set_t set)
{
*/
void *xbt_setset_set_choose(xbt_setset_set_t set)
{
- int i;
+
unsigned
int i;
/* Traverse the set and return the first element */
for (i = 0; i < set->size; i++)
if (set->bitmap[i] != 0)
/* Traverse the set and return the first element */
for (i = 0; i < set->size; i++)
if (set->bitmap[i] != 0)
@@
-237,7
+243,8
@@
int xbt_setset_set_belongs(xbt_setset_set_t set, void *obj)
int xbt_setset_set_size(xbt_setset_set_t set)
{
int xbt_setset_set_size(xbt_setset_set_t set)
{
- int i, count = 0;
+ unsigned int i;
+ int count = 0;
for (i = 0; i < set->size; i++)
count += bitcount(set->bitmap[i]);
for (i = 0; i < set->size; i++)
count += bitcount(set->bitmap[i]);
@@
-254,7
+261,7
@@
int xbt_setset_set_size(xbt_setset_set_t set)
*/
void xbt_setset_add(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
*/
void xbt_setset_add(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
- int i;
+
unsigned
int i;
/* Increase the size of set1 if necessary */
if (set1->size < set2->size) {
/* Increase the size of set1 if necessary */
if (set1->size < set2->size) {
@@
-277,7
+284,7
@@
void xbt_setset_add(xbt_setset_set_t set1, xbt_setset_set_t set2)
*/
void xbt_setset_substract(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
*/
void xbt_setset_substract(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
- int i;
+
unsigned
int i;
for (i = 0; i < MIN(set1->size, set2->size); i++)
if (set2->bitmap[i] != 0)
for (i = 0; i < MIN(set1->size, set2->size); i++)
if (set2->bitmap[i] != 0)
@@
-294,7
+301,7
@@
void xbt_setset_substract(xbt_setset_set_t set1, xbt_setset_set_t set2)
*/
void xbt_setset_intersect(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
*/
void xbt_setset_intersect(xbt_setset_set_t set1, xbt_setset_set_t set2)
{
- int i;
+
unsigned
int i;
for (i = 0; i < MIN(set1->size, set2->size); i++)
if (set1->bitmap[i] && set2->bitmap[i])
for (i = 0; i < MIN(set1->size, set2->size); i++)
if (set1->bitmap[i] && set2->bitmap[i])
@@
-307,7
+314,7
@@
void xbt_setset_intersect(xbt_setset_set_t set1, xbt_setset_set_t set2)
void xbt_setset_cursor_first(xbt_setset_set_t set,
xbt_setset_cursor_t * cursor)
{
void xbt_setset_cursor_first(xbt_setset_set_t set,
xbt_setset_cursor_t * cursor)
{
- int i;
+
unsigned
int i;
(*cursor) = xbt_new0(s_xbt_setset_cursor_t, 1);
(*cursor)->set = set;
(*cursor) = xbt_new0(s_xbt_setset_cursor_t, 1);
(*cursor)->set = set;