gEDA-cvs: pcb.git: branch: master updated (9ef73a58992bcc5c2eb3a550bc9910bc20bd1778)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  9ef73a58992bcc5c2eb3a550bc9910bc20bd1778 (commit)
       via  e45f4e8d15f2c30f8ccb37de5b0bfa801fca572c (commit)
      from  b89fa5b38ebf2c7d59a2bdd3385878fffe117f26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/toporouter.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit e45f4e8d15f2c30f8ccb37de5b0bfa801fca572c
Author: Anthony M. Blake <anthonix@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Commit: Anthony M. Blake <anthonix@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

    Toporouter: fixed a few AMD64 warnings

:100644 100644 a02f628... ff6d804... M	src/toporouter.c

=========
 Changes
=========

commit e45f4e8d15f2c30f8ccb37de5b0bfa801fca572c
Author: Anthony M. Blake <anthonix@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Commit: Anthony M. Blake <anthonix@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

    Toporouter: fixed a few AMD64 warnings

diff --git a/src/toporouter.c b/src/toporouter.c
index a02f628..ff6d804 100644
--- a/src/toporouter.c
+++ b/src/toporouter.c
@@ -2798,14 +2798,14 @@ toporouter_heap_search(gpointer data, gpointer user_data)
   toporouter_heap_search_data_t *heap_search_data = (toporouter_heap_search_data_t *)user_data;
   if(v == heap_search_data->key) heap_search_data->result = v;
 }
-
+/*
 void 
 toporouter_heap_color(gpointer data, gpointer user_data)
 {
   toporouter_vertex_t *v = TOPOROUTER_VERTEX(data);
-  v->flags |= (unsigned int) user_data;
+  v->flags |= (guint) user_data;
 }
-
+*/
 inline gdouble
 angle_span(gdouble a1, gdouble a2)
 {
@@ -6095,7 +6095,7 @@ oproute_rubberband_segment(toporouter_t *r, toporouter_oproute_t *oproute, GList
   }
 
   arcs = g_list_sort(arcs, (GCompareFunc) compare_rubberband_arcs);
-rubberband_insert_maxarc:
+//rubberband_insert_maxarc:
   if(!arcs) return NULL;
   max = TOPOROUTER_RUBBERBAND_ARC(arcs->data); 
   
@@ -6828,8 +6828,11 @@ print_netscores(GPtrArray* netscores)
   printf("     %15s %15s %15s\n----------------------------------------------------\n", "Score", "Detour Sum", "Pairwise Fails");
 
   for(toporouter_netscore_t **i = (toporouter_netscore_t **) netscores->pdata; i < (toporouter_netscore_t **) netscores->pdata + netscores->len; i++) {
-    printf("%4d %15f %15f %15d %15x\n", (*i)->id, (*i)->score, (*i)->pairwise_detour_sum, (*i)->pairwise_fails, (unsigned int)*i);
+#ifdef DEBUG_NETSCORES    
+	printf("%4d %15f %15f %15d %15x\n", (*i)->id, (*i)->score, (*i)->pairwise_detour_sum, (*i)->pairwise_fails, (guint)*i);
+#endif 
   }
+
   printf("\n");
 }
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs