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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
include
/
xbt
/
function_types.h
diff --git
a/include/xbt/function_types.h
b/include/xbt/function_types.h
index
2f67456
..
84b8b3a
100644
(file)
--- a/
include/xbt/function_types.h
+++ b/
include/xbt/function_types.h
@@
-1,7
+1,6
@@
/* function_type.h - classical types for pointer to function */
/* function_type.h - classical types for pointer to function */
-/* Copyright (c) 2006-2007, 2009-2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2019. 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. */
/* 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. */
@@
-9,7
+8,7
@@
#ifndef XBT_FUNCTION_TYPE_H
#define XBT_FUNCTION_TYPE_H
#ifndef XBT_FUNCTION_TYPE_H
#define XBT_FUNCTION_TYPE_H
-#include
"xbt/base.h"
+#include
<xbt/base.h>
SG_BEGIN_DECL()
SG_BEGIN_DECL()
@@
-18,9
+17,7
@@
typedef void *(*pvoid_f_void_t) (void);
typedef void *(*pvoid_f_pvoid_t) (void *);
typedef void (*void_f_void_t) (void);
typedef void *(*pvoid_f_pvoid_t) (void *);
typedef void (*void_f_void_t) (void);
-typedef int (*int_f_void_t) (void);
-typedef int (*int_f_pvoid_t) (void*);
-
+typedef int (*int_f_int_pvoid_t)(int, void*);
typedef int (*int_f_pvoid_pvoid_t) (void *, void *);
typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *);
typedef int (*int_f_pvoid_pvoid_t) (void *, void *);
typedef int (*int_f_cpvoid_cpvoid_t) (const void *, const void *);