Module: xenomai-3
Branch: next
Commit: c52e08830612df3ede52389b228d7cc07fade417
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=c52e08830612df3ede52389b228d7cc07fade417
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Jul 20 18:45:01 2015 +0200
copperplate/threadobj, boilerplate/list: cope with pedantic C++ parsers
---
include/boilerplate/scope.h | 2 +-
include/copperplate/threadobj.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/boilerplate/scope.h b/include/boilerplate/scope.h
index d2203b3..98e1fe8 100644
--- a/include/boilerplate/scope.h
+++ b/include/boilerplate/scope.h
@@ -33,7 +33,7 @@ int pshared_check(void *heap, void *addr);
#define dref_type(t) memoff_t
-#define __memoff(__base, __addr) ((caddr_t)(__addr) - (caddr_t)(__base))
+#define __memoff(__base, __addr) ((memoff_t)((caddr_t)(__addr) -
(caddr_t)(__base)))
#define __memptr(__base, __off) ((void *)((caddr_t)(__base) +
(__off)))
#define __memchk(__base, __addr) pshared_check(__base, __addr)
diff --git a/include/copperplate/threadobj.h b/include/copperplate/threadobj.h
index 997334b..1d01709 100644
--- a/include/copperplate/threadobj.h
+++ b/include/copperplate/threadobj.h
@@ -84,7 +84,8 @@ static inline struct xnthread_user_window *
threadobj_get_window(struct threadobj_corespec *corespec)
{
extern void *cobalt_umm_shared;
- return cobalt_umm_shared + corespec->u_winoff;
+ return (struct xnthread_user_window *)
+ ((caddr_t)cobalt_umm_shared + corespec->u_winoff);
}
#else /* !CONFIG_XENO_PSHARED */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://xenomai.org/mailman/listinfo/xenomai-git
