From e6f725a5a62c74664c46ebc7a1008f2a45fd7708 Mon Sep 17 00:00:00 2001
From: jboisson <jboisson@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Thu, 21 Feb 2008 15:08:00 +0000
Subject: [PATCH] graph.ccp and .h have been updated to be compatible with
 windows compilation

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@995 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../trunk/combinatorial/routing/tsp/src/graph.cpp |  4 ----
 .../trunk/combinatorial/routing/tsp/src/graph.h   | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/contribution/trunk/combinatorial/routing/tsp/src/graph.cpp b/contribution/trunk/combinatorial/routing/tsp/src/graph.cpp
index fee995d12..412b9263a 100644
--- a/contribution/trunk/combinatorial/routing/tsp/src/graph.cpp
+++ b/contribution/trunk/combinatorial/routing/tsp/src/graph.cpp
@@ -34,10 +34,6 @@
 *
 */
 
-#include <fstream>
-#include <iostream>
-#include <math.h>
-
 #include "graph.h"
 
 using std::cout;
diff --git a/contribution/trunk/combinatorial/routing/tsp/src/graph.h b/contribution/trunk/combinatorial/routing/tsp/src/graph.h
index bea04b225..eb53ade4c 100644
--- a/contribution/trunk/combinatorial/routing/tsp/src/graph.h
+++ b/contribution/trunk/combinatorial/routing/tsp/src/graph.h
@@ -37,18 +37,23 @@
 #ifndef graph_h
 #define graph_h
 
+#include <string>
 #include <vector>
 #include <utility>
+#include <fstream>
+#include <iostream>
+#include <math.h>
+
 
 namespace Graph
-  {
-  void load (const char * __file_name) ;
+{
+  void load (const char * _file_name) ;
   /* Loading cities
      (expressed by their coordinates)
      from the given file name */
-
-  float distance (unsigned int __from, unsigned int __to) ;
-
+  
+  float distance (unsigned int _from, unsigned int _to) ;
+  
   unsigned int size () ; // How many cities ?
 }