X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn_network.h;h=a734cadb30e8d29d5bd65600d3023d705ad95417;hb=f3635d61e91198d4a40126bab3e4a3c1b1e49724;hp=33c5188c9355e00e0d3e3aa78607bce14ea7a04a;hpb=d1a2d24d9a9998bf408bc5008b884d820f5d619f;p=sort-networks.git

diff --git a/src/sn_network.h b/src/sn_network.h
index 33c5188..a734cad 100644
--- a/src/sn_network.h
+++ b/src/sn_network.h
@@ -206,9 +206,11 @@ int sn_network_normalize (sn_network_t *n);
  * \return Zero on success, non-zero on failure.
  */
 int sn_network_cut_at (sn_network_t *n, int input, enum sn_network_cut_dir_e dir);
-sn_network_t *sn_network_combine (sn_network_t *n0, sn_network_t *n1,
-    int is_power_of_two);
-sn_network_t *sn_network_combine_bitonic (sn_network_t *n0, sn_network_t *n1);
+
+/**
+ * An alias for sn_network_combine_odd_even_merge().
+ */
+sn_network_t *sn_network_combine (sn_network_t *n0, sn_network_t *n1);
 
 /**
  * Combines two comparator networks using a bitonic merger. The number of
@@ -219,6 +221,7 @@ sn_network_t *sn_network_combine_bitonic (sn_network_t *n0, sn_network_t *n1);
  * \return Newly allocated network with twice the number of inputs or NULL on
  *   error.
  */
+sn_network_t *sn_network_combine_bitonic_merge (sn_network_t *n0, sn_network_t *n1);
 
 /**
  * Combines two comparator networks using the odd-even-merger.