From 9b7d942ab75d411c5bcac3e7e8bd89cca324c299 Mon Sep 17 00:00:00 2001
From: Hugo Clement <alliance-cvs@asim.lip6.fr>
Date: Wed, 3 Apr 2002 09:52:19 +0000
Subject: [PATCH] A little bit of C++.

---
 alliance/src/ocr/configure.in         |  1 +
 alliance/src/ocr/src/rout/Makefile.am |  2 +-
 alliance/src/ocr/src/rout/ocrRouter.c | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/alliance/src/ocr/configure.in b/alliance/src/ocr/configure.in
index 5993eaa3..acd3a894 100644
--- a/alliance/src/ocr/configure.in
+++ b/alliance/src/ocr/configure.in
@@ -18,6 +18,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_RANLIB
 AC_PROG_MAKE_SET
 
diff --git a/alliance/src/ocr/src/rout/Makefile.am b/alliance/src/ocr/src/rout/Makefile.am
index 696515e3..c99f74c7 100644
--- a/alliance/src/ocr/src/rout/Makefile.am
+++ b/alliance/src/ocr/src/rout/Makefile.am
@@ -13,4 +13,4 @@ ocr_LDADD = @LIBS@ \
 
 ocr_SOURCES = display.c findNPointsPath.c getOption.c\
 		ocrGlobalRouting.c ocrMst.c ocrRouter.c\
-		ocrWeightedTree.c ocrAstar.c
+		ocrWeightedTree.c ocrAstar.cpp
diff --git a/alliance/src/ocr/src/rout/ocrRouter.c b/alliance/src/ocr/src/rout/ocrRouter.c
index ccc6e88e..57fcc8e7 100644
--- a/alliance/src/ocr/src/rout/ocrRouter.c
+++ b/alliance/src/ocr/src/rout/ocrRouter.c
@@ -1,8 +1,11 @@
 /*
    ### -------------------------------------------------- ### 
    $Author: hcl $
-   $Date: 2002/03/22 09:41:09 $
+   $Date: 2002/04/03 09:52:19 $
    $Log: ocrRouter.c,v $
+   Revision 1.4  2002/04/03 09:52:19  hcl
+   A little bit of C++.
+
    Revision 1.3  2002/03/22 09:41:09  hcl
    ALLIANCE_VERSION
 
@@ -392,7 +395,6 @@ reRoute(ocrRoutingDataBase * i_pDataBase,
     chain_list *l_pSignalList;
     ocrConnector *l_pCon;
 
-//  puts ("reRoute");
 
     // routage du signal désigné par i_pSignal
     //  fprintf (stdout, "reRoute : Routage du signal %ld \n",
@@ -414,7 +416,6 @@ reRoute(ocrRoutingDataBase * i_pDataBase,
 
     } else {
         l_uReturnValue = 0;
-        //  puts ("Echec reRoute");
         display(LEVEL, VVERB, "o Echec reRoute %ld\n", i_pSignal->INDEX);
 
         i_pSignal->ROUTED = 2;
@@ -847,13 +848,17 @@ dumpSignalsToPhFig(ocrSignal * i_pSignal,
 {
     ocrSignal *l_pSignal;
     ocrWSegment *l_pSegment;
+    ocrNaturalInt nseg;
 
     for (l_pSignal = i_pSignal; l_pSignal; l_pSignal = l_pSignal->NEXT) {
+        //nseg = 0;
         for (l_pSegment = l_pSignal->SEGMENT;
              l_pSegment; l_pSegment = l_pSegment->NEXT) {
             addSegmentToPhFig(i_pParam, l_pSegment, i_pPhFig, l_pSignal->NAME);
             addViaForIntersection(i_pParam, l_pSegment, i_pPhFig);
+            //nseg ++;
         }
+        //display (LEVEL, VVERB, "o %ld segments for %s\n", nseg, l_pSignal->NAME);
     }
 }