Merge branch 'release/debian/5.2-1_exp1'HEADdebian/5.2-1_exp1master

1 files changed, 3 insertions, 35 deletions

diff --git a/include/libHX/deque.h b/include/libHX/deque.h
index f43def9..11fdd2a 100644
--- a/include/libHX/deque.h
+++ b/include/libHX/deque.h
@@ -25,7 +25,7 @@ struct HXdeque {
 	struct HXdeque_node *first;
 	void *ptr;
 	struct HXdeque_node *last;
-	unsigned int items;
+	size_t items;
 };
 
 extern struct HXdeque *HXdeque_init(void);
@@ -39,7 +39,8 @@ extern void *HXdeque_get(struct HXdeque *, const void *);
 extern void *HXdeque_del(struct HXdeque_node *);
 extern void HXdeque_free(struct HXdeque *);
 extern void HXdeque_genocide2(struct HXdeque *, void (*)(void *));
-extern void **HXdeque_to_vec(const struct HXdeque *, unsigned int *);
+extern void **HXdeque_to_vec(const struct HXdeque *, size_t *);
+extern void **HXdeque_to_vecx(const struct HXdeque *, size_t *);
 
 static __inline__ void HXdeque_genocide(struct HXdeque *dq)
 {
@@ -48,39 +49,6 @@ static __inline__ void HXdeque_genocide(struct HXdeque *dq)
 
 #ifdef __cplusplus
 } /* extern "C" */
-
-extern "C++" {
-
-template<typename type> static __inline__ type HXdeque_pop(struct HXdeque *dq)
-{
-	return reinterpret_cast<type>(HXdeque_pop(dq));
-}
-
-template<typename type> static __inline__ type
-HXdeque_shift(struct HXdeque *dq)
-{
-	return reinterpret_cast<type>(HXdeque_shift(dq));
-}
-
-template<typename type> static __inline__ type
-HXdeque_get(struct HXdeque *dq, const void *ptr)
-{
-	return reinterpret_cast<type>(HXdeque_get(dq, ptr));
-}
-
-template<typename type> static __inline__ type
-HXdeque_del(struct HXdeque_node *nd)
-{
-	return reinterpret_cast<type>(HXdeque_del(nd));
-}
-
-template<typename type> static __inline__ type *
-HXdeque_to_vec(struct HXdeque *dq, unsigned int *n)
-{
-	return reinterpret_cast<type *>(HXdeque_to_vec(dq, n));
-}
-
-} /* extern "C++" */
 #endif
 
 #endif /* _LIBHX_DEQUE_H */