X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fjsw%2Fjsw_rbtree.c;h=62e414481675faf540fed9b2f8172b569e90cae8;hb=94724d7dd33cf19e283d86109adc037c0d771b6d;hp=c5ec17ca707f4505da7cb23d5bda7f0895b24e48;hpb=d37d830611a8dc438b2de37f68bf2f9ae1230490;p=zpackage

diff --git a/lib/jsw/jsw_rbtree.c b/lib/jsw/jsw_rbtree.c
index c5ec17c..62e4144 100644
--- a/lib/jsw/jsw_rbtree.c
+++ b/lib/jsw/jsw_rbtree.c
@@ -6,15 +6,7 @@
 */
 #include "jsw_rbtree.h"
 
-#ifdef __cplusplus
-#include <cstdlib>
-
-using std::malloc;
-using std::free;
-using std::size_t;
-#else
 #include <stdlib.h>
-#endif
 
 #ifndef HEIGHT_LIMIT
 #define HEIGHT_LIMIT 64 /* Tallest allowable tree */
@@ -110,7 +102,7 @@ static jsw_rbnode_t *jsw_double ( jsw_rbnode_t *root, int dir )
 */
 static jsw_rbnode_t *new_node ( jsw_rbtree_t *tree, void *data )
 {
-  jsw_rbnode_t *rn = (jsw_rbnode_t *)malloc ( sizeof *rn );
+  jsw_rbnode_t *rn = malloc ( sizeof *rn );
 
   if ( rn == NULL )
     return NULL;
@@ -137,7 +129,7 @@ static jsw_rbnode_t *new_node ( jsw_rbtree_t *tree, void *data )
 */
 jsw_rbtree_t *jsw_rbnew ( cmp_f cmp, dup_f dup, rel_f rel )
 {
-  jsw_rbtree_t *rt = (jsw_rbtree_t *)malloc ( sizeof *rt );
+  jsw_rbtree_t *rt = malloc ( sizeof *rt );
 
   if ( rt == NULL )
     return NULL;
@@ -439,7 +431,7 @@ size_t jsw_rbsize ( jsw_rbtree_t *tree )
 */
 jsw_rbtrav_t *jsw_rbtnew ( void )
 {
-  return (jsw_rbtrav_t*)malloc ( sizeof ( jsw_rbtrav_t ) );
+  return malloc ( sizeof ( jsw_rbtrav_t ) );
 }
 
 /**
@@ -578,4 +570,4 @@ void *jsw_rbtnext ( jsw_rbtrav_t *trav )
 void *jsw_rbtprev ( jsw_rbtrav_t *trav )
 {
   return move ( trav, 0 ); /* Toward smaller items */
-}
\ No newline at end of file
+}