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 'models_type_rework_part2_try2' into 'master'
[simgrid.git]
/
include
/
xbt
/
function_types.h
diff --git
a/include/xbt/function_types.h
b/include/xbt/function_types.h
index
7e476a7
..
248ecff
100644
(file)
--- a/
include/xbt/function_types.h
+++ b/
include/xbt/function_types.h
@@
-1,10
+1,6
@@
-/* $Id$ */
-
/* function_type.h - classical types for pointer to function */
/* function_type.h - classical types for pointer to function */
-/* Copyright (c) 2004-2006 Martin Quinson. */
-/* Copyright (c) 2004 Arnaud Legrand. */
-/* All rights reserved. */
+/* Copyright (c) 2006-2021. 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. */
@@
-12,20
+8,21
@@
#ifndef XBT_FUNCTION_TYPE_H
#define XBT_FUNCTION_TYPE_H
#ifndef XBT_FUNCTION_TYPE_H
#define XBT_FUNCTION_TYPE_H
-#include "xbt/misc.h"
-
-SG_BEGIN_DECL()
+#include <xbt/base.h>
- typedef void (void_f_ppvoid_t)(void**);
- typedef void (void_f_pvoid_t) (void*);
- typedef void* (pvoid_f_void_t)(void);
- typedef void* (pvoid_f_pvoid_t)(void*);
- typedef void (void_f_void_t) (void);
+SG_BEGIN_DECL
- typedef int (int_f_void_t) (void);
+typedef void (*void_f_pvoid_t) (void *);
+typedef void *(*pvoid_f_void_t) (void);
+typedef void *(*pvoid_f_pvoid_t) (void *);
+typedef void (*void_f_void_t) (void);
- typedef int (int_f_pvoid_pvoid_t) (void*,void*);
+typedef void (*void_f_int_pvoid_t)(int, 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 *);
-SG_END_DECL()
+typedef void (*xbt_main_func_t)(int argc, char* argv[]);
-#endif /* XBT_MISC_H */
+SG_END_DECL
+#endif /* XBT_FUNCTION_TYPE_H */